Done, see c7f930a38dae57dd7648ed5f210daa0c9381a491 (now part of the pull request)

Thanks again for the guidance.