More progress on python 3 changes.