Avoid more warnings.

Mostly, instances of the dreaded "unused local typedef" warnings
that gcc 4.8 is so fond of emitting.