Tweaked dependency graph a bit.