Refactor Object, NestedModel and Modal into separate definitions, rather than relying on editor type names to determine behaviour.
Use 'returnsModel' flag on editor to determine whether or not to use a collection in the list.