Fix dep cycle.