Add cave predicates for traps, and use them