More subtype cases for ClassType, but still not all (need to add vars etc).