Only keep track of current row position, not a whole range.

Change-Id: I8ad56284b9c5422d102c7e8688e5b1e4c37ae877