Fix what is AFAIK the last round of line-wrap and trailing whitespace fixes...