Further py3k changes.