Is there a specific reason you didn't like this metric type logic consolidated here? We added this function after having found that we missed capturing the right type for some metrics in some display contexts.