Use more modern streams2 streaming api

Better to call end when we can.