The fix is to not use the index and table of type code constructors,.
The indices and tables should be cleaned up later.