Apply a couple more 2to3 fixes, still avoiding the hard ones.(#985310).