Optimize predicate creation a bit