Merge refactoring I did when committing r72267 to trunk into the
already committed issue4751 support in py3k r68411.
3 files changed