Improved Python 3 support.