Change InjectionPair to InjectionRegistrar, clean ups