Start of work to support a refactoring to enable jsr330 (DI)