Merge "Clean up DependencyProvider a bit"