Improves the readability of the code, and reduces the liklihood of errors.
Also made a few minor style changes.
Reviewed-by: NRich Salz <rsalz@openssl.org>