Are all these changes just whitespace? I'd rather not have to merge a bunch of whitespace fiddles if I can avoid it.