wip: cleaning up what i hope is right committed lines now, from 20d348f and maybe de94c43.
Not sure how we got some right, some wrong in that commit??  Work in
progress is to allow importing files into the model (2-space per indent
collapsible outlines).