I tried to clean up these, but there are still multiple places where white space problems have crept in during rebasing and such. It will be easier to fix all of them in one go after merging.