Better support for py3k code.