Keep track of the index we started at.

It is looking like more advanced merging will require keeping track of
where the index was last time we did a full advance.

Change-Id: Ief98b6b63eee3e1d7309e504ff7a6433a9d1b6a5