Some minor improvements discovered with Faux Pas.