Remove remaining references to internal OrderedDict.