Fix dealing with predicates that might be none