Sema: Minor const fixups and control flow tidying.

No functionality change.

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