Reduced nesting of crap in ServiceInjector