I was mechanically editing and not thinking as clearly as you :-) I've made the change on the branch I'm progressing for the other fixes.