Fix some issues with the with-channel macro.