trailing whitespace again

Trailing whitespace has been creeping back into the sources; if you are committing to git, please check that you are not introducing it into the files you modify.

Eric