Remove some unnecessary objects around metrics handling for simplicity.

Check it out, -21 lines net!!!