Fixed event usage to be more sane.