Fixing assertion failure introduced in 196602.

Also includes a minor refactor with no functional change.



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