Fix aggregates to use normalised numeric values.