I don't know what cargo cult coding style you want adhere to, but there is nothing wrong with the linked diff's.

It's quite readable and has yet to tangle itself in the ifdef mess that is openssl.