Fixed compatibility issue with QuickChannelSwitchCommand, and generally cleaned things up over there.