Merge __next__ method link fixes with 3.3.