Still more trailing whitespace fixes