Update to tweaked heap_index API.