These should probably be submitted upstream. They're inevitably going to complicate merges, and because they're non-functional changes this just isn't worth our time.