Unified the message and stream queues.