Reworking the extraction of fields from the stream.