Silence some new gcc warnings.

With gcc-4.8.2 some new warnings are added to -Wall. Notably there is one that shows locally defined types that are not used. This patch set corrects those warnings.