Got rid of internal istreams.