Issue #16199: Merge 2to3 typo fix from 3.3 (and resolve previous merge).