Make the Python code work in both Python 2.7 and 3.3+; other minor fixes