Make sure message_stats and queue_totals are serialized as JSON objects
Refactor

 * Wrap all values in {struct, OldVal}
 * Use a list comprehension