Another try on fixing gcc 4.6 build.

Unreviewed build fix.