That should be identical to it.
Yes, I can see now why you mentioned potential merge conflicts...
Initially I was more concerned with making it as easy as possible to identify the purpose of various sections of the patch before any attempts could be made at a non-monolithic version.
Even if it's just for auditing and reverse engineering purposes, this still helps a lot.
Thanks.