I worry about these comments above and below adding to merge conflict risk since they are not directly related to thie patch at hand.  Given that we may have to back things out, let's aim for patches that are as clean and single-purpose as possible.