I think we all agree that this issue is outside the scope of this pull request, so let's leave it alone for now so we can merge it, and someone can open another issue for it if changing this is a priority.