safe refacting in prep for istream_parser/istream_stream_ijsource split