Fix the linux gcc 4.6.3 buildbot failures that happened after my recent types checkin.