Since the old version didn't use iterkeys(), I would have left it unchanged which would still be correct py2 and py3 with more efficient py3.

We are using ordereddict only for small dictionaries.