Some more work on dependency resolution.