Replace dynamic var with with-redefs