Final py3k adjustments.