streams2 is now sufficiently fixed up for this to work, so clean-up a bit