Keep EventHandler notation

By request of @nicolas-f