Make sure measures are always DataShapes for unification