Does it not make sense to consolidate all auxiliary data in the audit_context to audit_aux_data? The audit_names structure looks like a perfect candidate for audit_aux_data... yes/no? -tim