Simplify event triggers

nit, this is slightly superfluous with L80