Fix bug where event handler return values weren't being used.