Metrics refactoring.