Fix whitespace issues

That's what I get for using FileMerge as my mergetool.