Generalise auxiliary data keys in aggregators.
Replace existing weights handling in collapse.