Updated issues found via 2to3.