course, would be to fix the include-file bugs; that may follow later.)
before any cleanup at all, per discussion with perry@.