More Py2.5-compatibility