queue2: fix refactoring of draining-on-eos, munge flow return to FLOW_OK