Better handling of metric totals.