More Python 3 support changes.