Well with the inconsistency we have now, what is the right iron fist to
apply? Demand the code is consistent with the file you edit or that it's
consistent with whats in CODING_STYLE, even if it means that what you
apply is completely different to the rest of the file?
That is the part I think needs to be decided upon in all of this.

Patch lines that start with ^\+ should be consistent with CODING_STYLE.
The maintainers may allow exceptions in certain cases, but contributors
shouldn't expect this. Use common sense where available.