CMS-1932 Refactor some global WizardEvents to be "local events"