ReplyChannel partial refactoring