Variety of fixes.
Incl: revert one part of earlier bugfixes that wasn't right.
And more.
Misc...wip...thinking: commit before a refactor.
Things like this really wouldn't be good to push if there were more
than one developer, because it's messy for others to know what
you're up to, and they shouldn't have to clean up. But it's just
me, and I plan to, anyway.  But it will be easier to do several
things that need to be done next, if the refactor comes next.