Revert "much more flexible if Event is a pointer"

This introduces nasty races, need to re-think it.

This reverts commit 27699178b29ee8e993ff99a9b0d9fe45c8285f7c.