Cruft

…can't remember where I was going with that.
Service-aware helper
Sort offline streams by name
Default streams
Clarity