Applied Anthony's suggestions from his review of my code (first round).