More 2to3 corrections.