Why are there a bunch of ostensibly unrelated changes in this diff?