MARDS supports imported schema documents far better.

Next, need to finish up the new import methodology with 'extend' and 'recurse'.

After that:

* fix 'two searches at same level' bug
* allow names under choice fields.
* document this last round of changes; or at least insert the TODOs.