Cleaning up trailing whitespace makes me cranky >:-(