More improvements from Aaron S. Hawley <aaron.s.hawley@gmail.com>.