Move local type tags out of individual tests.

This fixes build on GCC 4.4.