tiny tweaks to EventHandle