More trailing whitespace fixes