Improve injection style and fix missing injector annotation.