Move with-redefs next to transaction start, they belong together.