Few more metric cleanups.