Stats fixes

Turns out, suggestions are pretty much doing their own thing in their own mysterious block when saving. I'm terribly confused as to why, and that one block needs cleanup, but until then we have conformance tests and a fix for the behaviour @dwaynebailey was seeing.