Changes iterator to eliminate the need for explicit return value