I'm not sure this change is really relevant. Unrelated changes should be in their own ticket/PR. Same goes for the other similar changes.