Ran through 2to3--picked up a lot of fun stuff