Finish first pass on higher-order streams and timespan concepts