Some cleanup in the MessageSwitch class.

The constexpr wasn't needed so I could drop moving and returning an rvalue all together.