Trivial refactoring suggested by 2to3. All regression tests pass.