Refactoring #20B: using entity::Metrics all over.