diff --git a/src/misc/crypt/crypt_register_all_ciphers.c b/src/misc/crypt/crypt_register_all_ciphers.c
index 80db5d2..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 4493d8f..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 3b9139d..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)