Simplify further.

Thanks to David Blaikie for the push.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@199685 91177308-0d34-0410-b5e6-96231b3b80d8
Merge branch 'master' of http://llvm.org/git/clang into hybridxx