Start using ServiceBuilder and Service in other catalog nodes and builders.
More Service*Container work.
Move Service containers and trackers to straightimpl to simplify things for now.