Python 3 related changes.