More dependency injection for fun and profit.