Substantial rewrite as a suggested -01 version.

There are quite a lot of separate changes in this rework, which I've kept in separate commits with their own rationales. See the subsidiary commit messages for details.