Clean up channel updating macro somewhat