Attempt #2 at appeasing GCC 4.3. This compiler really doesn't like these

traits.

With this change, the pattern used here is *extremely* close to the
pattern used elsewhere in the file, so I'm hoping it survives the
build-bots.

llvm-svn: 152225