These unrelated changes get in the way of understanding the real change in this PR. :unamused: