Work around build breakages with GCC 4.2.

Reported by:	tinderbox