Change in osmo-e1d[master]: mux_demux: Shuffle functions around for consistency