Added subtype declarations to TypeMap, removed SubtypeMap.