Merge single events with regular events

[mjauvin]

Todo: remove the event handler if it was set as $once = true. In order to do this, we need to restructure the events array to be able to target a specific event handler.