[DependencyInjection] Tweak factories as callables feature