More work for Python 3 support.