More Python 3 updates.