Apply suggestions from Andy Lutomirski.