Re #2: Fixes accumulation of user-defined metrics.