ran through python-modernize, plus hand-change to ordered.py