Remove other unneeded whitespace changes added since 1.9.2