[PM] Take more drastic measures to work around MSVC's failure on this

code. If this doesn't work and I can't find someone to help who has MSVC
installed, I'll back everything out I guess. =[

llvm-svn: 291661