ChannelSelection: Simplify some code