Fix the event bug that was haunting me

Never believed that implicit returns will byte me, but here I am several
hours into debugging it...