Reworking our stream reading.