Various bugfixes to heap_index_hooks, mostlyin deep index logic.