Issue #124: Remaining dangling references to HI fixed.