Comment fix.
Properly handle trailing whitespace in diffs.

And fix test fallout from the change.