Swap to auto-wired constructor based dependency injection. Hurrah for common sense!