Nice set of fixes to the type system, using external generic-type tool.
First round of JSON state fixes, it is quite strict in the bean-like character of the data you store.