[opaque pointer type] Cleanup a few references to pointee types using nearby non-pointee types of the same value

& cleanup a convoluted return expression while I'm here

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@236912 91177308-0d34-0410-b5e6-96231b3b80d8
1 file changed