Minor refactoring: make indenting of metrics lazy+dynamic