Remainder of Dispatcher extension now follows new API
Ensure that injector extension internally uses new API
Reflector extension now implements new API