Improved handling of effects on events