ChannelSelection: Improve and simplify correctChannelNumber