Better with-handlers support in TR

Checks consistency between predicates and handlers in `with-handlers` clauses.