Beefed up Muffin.Events.