For het. q and variant two, the average in subsets should be weighted where the weights are q values.