I switched this back to registerMetric.  

When I push these changes, do you prefer that I create a new commit (might be easier to check each of each these changes) or squash into the one commit as I have been doing?