Unite code for user streams and tag streams.  Fixes #532.