Fixes some event inheritance issues by moving subchecks out of the events,
not done yet.