better handling of channel set in choice compilation