In interest of keeping things moving, if you think this change is worth making, it's probably better to make that change in a separate PR.