Correcting role annotation
Readding missing constructor
Regenerating
Removing old code
Adding ToQuery verbatim instances for all types
Regenerating
Removing Generic derivations for complex types (due to unused-ness)
Alignment
Merging unflattened node lists
Merging in flattened Lists/Maps for ToXML instances