More metric collection work.