More work towards bug #7376.  The channels are now numbered.