yet more metrics cleanup
Bit of refactoring, to try to get to async reloading of metrics