[PATCH 4/5] Audit type-independent events