Clean up a bit of metric parsing logic.

Maybe.