Replace usage of "OrderedDict" by "dict"

[jbbarth]

Since Python 3.7 the standard "dict is ordered AND the ordering is part of the specification, so it can be relied upon. We don't need OrderedDict anymore.