fixup! Use channel state lookup macros in channel.c