Mods to make HINT terminate appropriately.