Thanks for doing the review. I'm not sure what things to go change without further feedback/discussion, except point 4. I'll wait a day to see if I get more feedback on the other issues and submit a new patch.
I've fixed a conflict, and I've removed extraneous semicolons from the C.
I've left in the fixing of some existing bad indenting in the existing code, which is not strictly related to my change.
I hope my defenses of the other points were persuasive.
