More Py3k updates.