More improvements to trailing whitespace highlighting.