Fixing compiler warnings

https://www.pivotaltracker.com/story/show/81290082
Actually, there's a subtle point here. We have all this entangled metrics code, and we test none of it. If we are advertising metrics originated by this kind of code _as Fedora functionality_, it's just as much subject to our own testing as plain old CRUD.