Small changes from bigger rewrite, to make clearer the (more) substantial upcoming edits.

... as part of #293.  Improvement in and of themselves, and are a rebase pain.