Can you get rid of the whitespace changes here and elsewhere?