Fix message event unification. Fixes #11