Saxon

Thanks for offering this. Technically, it looks fine.

Sorry to be tedious, but could you please confirm that you are submitting this code to be released under the Mozilla Public License and that you have authority (e.g. from your employer) to submit it?

(In future, for a small change like this, there's less admin hassle if you just describe the change that's needed rather than submitting code; we have to review it line-by-line anyway to assess whether test cases are needed).

I am the author of the attached patch file and I do confirm that I release this code under the Mozilla Public License.

Hopefully this formal statement satisfies the necessary administration hassle.

I am also fine if you do not apply the patch but just take it as a guide and write you on solution.

In the case that this would mean less hassle for you and it would speed up the implementation process, go for it!