Dicts are "less ordered" in Python 3.  Fixes some bugs related to this