Simplify ChannelState checks