Yet another fix to PredicateTree...