As said before, we should try to uniform events and messages to have one array, and therefore simplify the code above about `queue`, removing the curry.