Even more Python 3 compatibility fixes.