Backport to Python 2.7

Also caught a bug where the statistics were still scoring by total score for the win.