Rework the way we handle external events to permit a hook. Also, slightly more consistent.
Rework the way we handle external events to permit a hook. Also, slightly
more consistent.

erkyrath/quixe,erkyrath/quixe,erkyrath/quixe