refactored calculated aggregations to formalize support for any
non-calculated aggregation as source measure.