Perhaps worth clobbering all of those end-of-line spaces in a single commit.