Also a couple of other changes to avoid use of PointerType::getElementType here & there too. llvm-svn: 236799