Add event id parm to handler sig; trigger() now returns event id