Messaging: Simplify/Optimise Channel Enable/Disable functionality &
provide a CLI API. Bugfixes/tweaks along the way.