Incremental improvement... based on the expanded description of
associated streams...