As discussed, you're happy with this for this pull request, and I'll raise an issue to track the general issue.