Those are just the yellow ones that I brought to your attention. I don't give myself the freedom to make it part of a simple rewrite. I think it's a bit more than that. As Mr. Nater pointed out, and he's perfectly right, if there are reasons that the choice was made to keep it the way it is, then it should be kept the way it is.
On April 9th, 2019. See this statement in context.