More metrics groundwork.