Cleanup, add comments and address review comments.

No functional changes.

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