Channel-ize some more

Signed-off-by: Rick Copeland <rick@arborian.com>