Add with-redefs

Remove duplication by using with-redefs in binding