Clean up things pointed out by 2to3