Even more Python 3 fixes.