Fixing compiler warnings

https://www.pivotaltracker.com/story/show/81290082
It seems like there are two subtle points here:
- Do we like the pattern of entangled metrics code?
- In any case, we need to implement a testing pattern for it.