Move local type tags out of individual tests.

This fixes build on GCC 4.4.
Merge pull request #642 from bska/no-local-tags

Move local type tags out of individual tests.