Fixed stale references to map_type (now OrderedDict)