Yeah, take a Source and buffer it unconditionally. The cost of an extra layer of buffering is negligible because of the way the segments work internally.