Fix remaining py3k syntax errors