Move channel restoration after monitor update to a two-part macro