Get rid of extra complexity with service values

We don't need to enumerate the service types - we can simply match
at consumption time on patterns.