Query: Converted stats classes to not store Elements.

Using primitive types instead. This will make it easier to serialise
statistics objects.
Query: Fixed misspelled method name.