#482 Syntax refactoring, changed Where(s => s is IServiceWithType).Cast<IServiceWithType>() to OfType<IServiceWithType>()