Remove some more trailing whitespace