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