Seems like a more logical place if we're going to be reusing it for aggregation-set transformations as well.