Moved ClassType fields into the ClassDefinition class once again.