Remove excess `channel_state` passing to macros