Remove stream queue entry consistently from wheel. While there, improve the handling of drain.
MFC after: 3 days