Further trailing whitespace fixes.