Reworked ADD_EVENT() wrt handling of the inherited method.