Port by-year changes.
Strip trailing whitespace