Collate now does better job of not conflating conditions where one is a substring of another.