As discussed offline, this is a change that may be worth doing, but perhaps not in this PR. :)