More Py3k support.