Some more cleanup.
Expanded ClassBuilderTest a bit to test special types.