Correctly implement single-channel 'delegate' semantics