diff --git a/lib/puppet/transaction/report.rb b/lib/puppet/transaction/report.rb
index 16b854afc..f78b5aa21 100644
--- a/lib/puppet/transaction/report.rb
+++ b/lib/puppet/transaction/report.rb
@@ -1,157 +1,156 @@
 require 'puppet'
 require 'puppet/indirector'
 
 # A class for reporting what happens on each client.  Reports consist of
 # two types of data:  Logs and Metrics.  Logs are the output that each
 # change produces, and Metrics are all of the numerical data involved
 # in the transaction.
 class Puppet::Transaction::Report
   extend Puppet::Indirector
 
   indirects :report, :terminus_class => :processor
 
   attr_accessor :configuration_version
   attr_reader :resource_statuses, :logs, :metrics, :host, :time, :kind
 
   # This is necessary since Marshall doesn't know how to
   # dump hash with default proc (see below @records)
   def self.default_format
     :yaml
   end
 
   def <<(msg)
     @logs << msg
     self
   end
 
   def add_times(name, value)
     @external_times[name] = value
   end
 
   def add_metric(name, hash)
     metric = Puppet::Util::Metric.new(name)
 
     hash.each do |name, value|
       metric.newvalue(name, value)
     end
 
     @metrics[metric.name] = metric
     metric
   end
 
   def add_resource_status(status)
     @resource_statuses[status.resource] = status
   end
 
   def finalize_report
-    calculate_resource_metrics
-    calculate_time_metrics
-    calculate_change_metric
-    calculate_event_metrics
+    add_metric(:resources, calculate_resource_metrics)
+    add_metric(:time, calculate_time_metrics)
+    add_metric(:changes, {:total => calculate_change_metric})
+    add_metric(:events, calculate_event_metrics)
   end
 
   def initialize(kind, configuration_version=nil)
     @metrics = {}
     @logs = []
     @resource_statuses = {}
     @external_times ||= {}
     @host = Puppet[:certname]
     @time = Time.now
     @kind = kind
     @report_format = 2
     @puppet_version = Puppet.version
     @configuration_version = configuration_version
   end
 
   def name
     host
   end
 
   # Provide a summary of this report.
   def summary
     ret = ""
 
     @metrics.sort { |a,b| a[1].label <=> b[1].label }.each do |name, metric|
       ret += "#{metric.label}:\n"
       metric.values.sort { |a,b|
         # sort by label
         if a[0] == :total
           1
         elsif b[0] == :total
           -1
         else
           a[1] <=> b[1]
         end
       }.each do |name, label, value|
         next if value == 0
         value = "%0.2f" % value if value.is_a?(Float)
         ret += "   %15s %s\n" % [label + ":", value]
       end
     end
     ret
   end
 
   # Based on the contents of this report's metrics, compute a single number
   # that represents the report. The resulting number is a bitmask where
   # individual bits represent the presence of different metrics.
   def exit_status
     status = 0
     status |= 2 if @metrics["changes"][:total] > 0
     status |= 4 if @metrics["resources"][:failed] > 0
     status
   end
 
   def to_yaml_properties
     (instance_variables - ["@external_times"]).sort
   end
 
   private
 
   def calculate_change_metric
-    total = resource_statuses.map { |name, status| status.change_count || 0 }.inject(0) { |a,b| a+b }
-    add_metric(:changes, {:total => total})
+    resource_statuses.map { |name, status| status.change_count || 0 }.inject(0) { |a,b| a+b }
   end
 
   def calculate_event_metrics
     metrics = Hash.new(0)
     metrics[:total] = 0
     resource_statuses.each do |name, status|
       metrics[:total] += status.events.length
       status.events.each do |event|
         metrics[event.status] += 1
       end
     end
 
-    add_metric(:events, metrics)
+    metrics
   end
 
   def calculate_resource_metrics
     metrics = Hash.new(0)
     metrics[:total] = resource_statuses.length
 
     resource_statuses.each do |name, status|
 
       Puppet::Resource::Status::STATES.each do |state|
         metrics[state] += 1 if status.send(state)
       end
     end
 
-    add_metric(:resources, metrics)
+    metrics
   end
 
   def calculate_time_metrics
     metrics = Hash.new(0)
     resource_statuses.each do |name, status|
       type = Puppet::Resource.new(name).type
       metrics[type.to_s.downcase] += status.evaluation_time if status.evaluation_time
     end
 
     @external_times.each do |name, value|
       metrics[name.to_s.downcase] = value
     end
 
     metrics["total"] = metrics.values.inject(0) { |a,b| a+b }
 
-    add_metric(:time, metrics)
+    metrics
   end
 end