Make tests pass on Py3k.