Cleanup trailing whitespace.
More trailing whitespace cleanup.