Improve derive(Event) and simplify macro code

Improve derive(Event) and simplify macro code #15256