Simplify iterator.  No need for the row number.