Refactor: Replace ServiceManagerServiceFactory invocations with direct ones.
Manual replace