Update event handling

*i.e.* just always do as @kevinsawicki suggests :smile: