Made another pass on the Python 3 support