Consolidate event type between function and decoder