Generalized support for + in stream names as separator.