Tweaked collapse rules to separate Flame and Hiero