Adding an out_type attribute to the generators, cleaning up some of the names in the type maps, and putting the type maps into OrderedDicts.