Yet more Py3k fixes.