Further reduced dependencies.
Fix to injection of services.