Minor changes for Python 3.3 support.