Work towards #20405
- Add missing visit of a navigable in SHTQ entry - Use HeapFunction instead of SafeFunction for entry callback