Fixup special casing of Bits muxes