Replace OrderedDict with dict

[mwtoews]

This maintenance enhancement would remove internal use of collections.OrderedDict with dict, which is easier to use and has a much more compact string representation (among other things).

The history why OrderedDict was used is because older Python versions (before CPython 3.6) had non-ordered dict objects.