Fix EventImplementor code duplication