Simplify the streams code even more