Replace defn/chan with calls to the channel model

Replace defn/chan with calls to the channel model #2330