Strip trailing whitespace, again