Lots of this sort of thing: moved corresponds_to right up to the top (below ASModel).  Now corresponds_to is responsible for creating the dynamic_enum definitions from the JSONModel.