Make with-spies accept with-redefs style bindings too