Remove some unnecessary whitespace changes added since 1.9.2
Remove other unneeded whitespace changes added since 1.9.2