Py3k adjustments.