Use multi-val dims for metrics

This reduces the size of metrics data generated.
If this were a function it could replace the impls in all query toolchests above.