More port to Python 3.