Begin work on fixing TrimTrailingWhitespace