Composer: Further work on EventSystem integration.