streams: minor tidy