Finish dealing with events

From #6359.
The `&` is un-needed. Object in PHP are passed by reference automatically.