[PATCH V6 0/2] audit: rebalance and remove extra layers of watch references