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