Misc. updates following 2to3 checks.

--HG--
branch : single-codebase