Do more to restore Py2.5 compatibility