Rewrite delegation to cut dependencies