Shoring up the dependency injection stuff.