diff --git a/src/misc/crypt/crypt_register_all_ciphers.c b/src/misc/crypt/crypt_register_all_ciphers.c
index 7d83acb..c8ec528 100644
--- a/src/misc/crypt/crypt_register_all_ciphers.c
+++ b/src/misc/crypt/crypt_register_all_ciphers.c
@@ -16,7 +16,7 @@
 */
 
 #define REGISTER_CIPHER(h) do {\
-   LTC_ARGCHK((err = register_cipher(h) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \
+   LTC_ARGCHK((err = register_cipher(h)) != -1); \
 } while(0)
 
 int register_all_ciphers(void)
diff --git a/src/misc/crypt/crypt_register_all_hashes.c b/src/misc/crypt/crypt_register_all_hashes.c
index 64ec0cc..e953332 100644
--- a/src/misc/crypt/crypt_register_all_hashes.c
+++ b/src/misc/crypt/crypt_register_all_hashes.c
@@ -16,7 +16,7 @@
 */
 
 #define REGISTER_HASH(h) do {\
-   LTC_ARGCHK((err = register_hash(h) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \
+   LTC_ARGCHK((err = register_hash(h)) != -1); \
 } while(0)
 
 int register_all_hashes(void)
diff --git a/src/misc/crypt/crypt_register_all_prngs.c b/src/misc/crypt/crypt_register_all_prngs.c
index ccd8a8c..08c6984 100644
--- a/src/misc/crypt/crypt_register_all_prngs.c
+++ b/src/misc/crypt/crypt_register_all_prngs.c
@@ -16,7 +16,7 @@
 */
 
 #define REGISTER_PRNG(h) do {\
-   LTC_ARGCHK((err = register_prng(h) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \
+   LTC_ARGCHK((err = register_prng(h)) != -1); \
 } while(0)
 
 int register_all_prngs(void)
diff --git a/src/misc/pkcs5/pkcs_5_test.c b/src/misc/pkcs5/pkcs_5_test.c
index c247fe8..1268154 100644
--- a/src/misc/pkcs5/pkcs_5_test.c
+++ b/src/misc/pkcs5/pkcs_5_test.c
@@ -201,7 +201,7 @@ int pkcs_5_test (void)
         }
         else if (compare_testvector(DK, dkLen, cases_5_1[i].DK, cases_5_1[i].dkLen, "PKCS#5_1", i)) {
             ++failed;
-       }
+        }
     }
 
     /* testing alg 1_openssl */