Needed work as part of #2492 - we'll straddle WUX and MUX namespaces/APIs for a bit until we get everything working on MUX.
