Fix applications that used HYPERPREDICATE_CONTAINS_LESS_THAN