Fix ATR-21843, which came from a ConfigFlag not being set. Make it so TriggerFlags are no longer used in various functions.