Merge "Move declaration of stream_type_t up earlier"