More work on Python 3.