Remove use of OrderedDict.