Applied patch from “2to3”.