This whole area needs a big rework, we seem to do the same checks over and over, and not properly use the utility routines (for example we do exactly these checks in checkEventType, again not using the resolved parameters).

WBRI-299