Refactor channel map update macros for use with `ChannelContext`