Fix a few small bugs in yesterday's event trigger patch.

Dimitri Fontaine