More trailing whitespace cleanup.