Should fix up streams module usage.