Clear the results in the case of a zero-item result

Change-Id: I80012c1008a21ddb992a451bc5144e3f4d3e6960
index: bunch of TODOs and planning for edge tracking

Also, change to storing a pointer to claims so those pointers can be re-used elsewhere.

Change-Id: Ib0979d622ba48f1e2389575d07d7a0930264ebea