No functionality change. Adjust a bunch of formatting issues in this code and
fix a typo in a comment.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@188857 91177308-0d34-0410-b5e6-96231b3b80d8