Suggested changes from 2to3 utility