Updated matching for binders
Some modifications on rewrting
Revert "Some modifications on rewrting"

This reverts commit 84eadaf97e7060d23d4fd39e9c9985ce835a5c6d.
Updated rewriting for term_dag