Okay. I think this is the only outstanding point. I think there's no rush on this.
If you're agreed, I'll hit the "merge" button (or you could, if you're up early and anxious), and we can pursue it separately. I think that'll a lot clearer than continuing here.
Of course, if you'd rather continue in this PR, I'm game.