Simplify and extend logic for starting the next subtream to handle
skipped substreams as well.