The current setup of one message type for queries and another for responses is not typesafe and the consumers are full of fail!(..) calls to handle unexpected responses. The queries should just take a channel parameter that will contain the response instead.