Fix code to avoid overusing injectors.