More cleanup of metric parsers.