PDP-99: Fix incrementing metrics, such as cache hit, to be suffixed with count