This is a good catch, but probably out of scope for this PR. I'll make this same change myself.