Now that isc_heap_delete() calls ->index(), is the change to rbtdb.c @@ setsigningtime() still required? The change to isc_heap_delete() and testcase looks ok. In the testcase, I'd assert e1.index != 0 in the first case as asserting index 1 looks for implementation detail. But that's just IMO.. it look fine other than that. Mukund