Hopefully a fix for grouping calculations, when the grouped element is a
join.  Need to key the grouped calculations by value, not label.