[opaque pointer type] Cleanup a few references to pointee types using nearby...

[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

llvm-svn: 236912