Some further work on event system integration.