mux multi-stream data

This uses the new muxer to multiplex/synchronize data streams from multiple flight endpoint/sources.

includes multiple cleanup commits, don't squash