More cleanup.
diff --git a/apps/s_client.c b/apps/s_client.c
index 028018a..b4ea03b 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2434,18 +2434,12 @@
 			   void *arg)
 	{
 	if (TLSEXT_TYPE_server_authz == ext_type)
-		{
-		server_provided_server_authz = (memchr(in,
-		TLSEXT_AUTHZDATAFORMAT_dtcp,
-		inlen) != NULL);
-		}
+		server_provided_server_authz
+		  = (memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL);
 
 	if (TLSEXT_TYPE_client_authz == ext_type)
-		{
-		server_provided_client_authz = (memchr(in,
-		TLSEXT_AUTHZDATAFORMAT_dtcp,
-		inlen) != NULL);
-		}
+		server_provided_client_authz
+		  = (memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL);
 
 	return 1;
 	}
@@ -2487,7 +2481,8 @@
 	unsigned char *result;
 	if (c_auth && server_provided_client_authz && server_provided_server_authz)
 		{
-		if (!c_auth_require_reneg || (c_auth_require_reneg && SSL_num_renegotiations(s)))
+		if (!c_auth_require_reneg
+		    || (c_auth_require_reneg && SSL_num_renegotiations(s)))
 			{
 			result = OPENSSL_malloc(10);
 			memcpy(result, "5432154321", 10);