Adapt to latest snap-predicates changes.