Fix circ dependencies.