Const-correctness, return-after-else, and formatting updates. NFC.

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