Rework the formula predicates: