Cleanup, and TypeUtils.addDecl now passing all its tests.