More extraneous spaces...

I think you get the picture, they're all over the place. These need to be removed in the original "Imported for Diff Visibility" commit.