I've rewritten the deprecated services using the `deprecatedService` helper from #1922. I added a test for `Deprecated`, and for `enforceDeprecation`, which isn't being used right now, but is there for future use. This also makes it possible to write services using BaseService which do not have any named parameters (with a test). Ref: #1358