Fix HUD highlighting broken with previous commit. Fix a race-condition bug where talking to an NPC again while remaining in place causes unexpected behavior.