Cleaning up the TypeSystem, almost ready for classes!