More MSVC fixes.

llvm-svn: 263251
3 files changed