Minor syntactical cleanup for metricId