Some more typing-related fixes.

llvm-svn: 163638
2 files changed