Update display logs and c files

author: Jason Gross <jgross@mit.edu> 2017-11-10 18:13:59 -0500
committer: Jason Gross <jgross@mit.edu> 2017-11-10 18:13:59 -0500
commit: 1e5b0a76fadd9255a0ead47d1327c628160b01bd (patch)
tree: 52c1b30c660dfb0c30f329295b7b46b712b88bb8 /src
parent: 6a335b31b69443cfe8ee46308eb94b299929c983 (diff)
1114 files changed, 3754 insertions, 3754 deletions
diff --git a/src/Specific/X25519/C32/freezeDisplay.log b/src/Specific/X25519/C32/freezeDisplay.log
index 1831379c8..b226eaf75 100644
--- a/src/Specific/X25519/C32/freezeDisplay.log
+++ b/src/Specific/X25519/C32/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x1ffffff);
  uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x3ffffff);
  uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x1ffffff);
- uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+ uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
  uint32_t x50 = (x49 & 0x3ffffed);
  uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint32_t x54 = (x49 & 0x1ffffff);
diff --git a/src/Specific/X25519/C64/freezeDisplay.log b/src/Specific/X25519/C64/freezeDisplay.log
index e25c7e397..1fec36950 100644
--- a/src/Specific/X25519/C64/freezeDisplay.log
+++ b/src/Specific/X25519/C64/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = subborrow_u51(x14, x6, 0x7ffffffffffff);
  uint64_t x19, uint8_t x20 = subborrow_u51(x17, x8, 0x7ffffffffffff);
  uint64_t x22, uint8_t x23 = subborrow_u51(x20, x7, 0x7ffffffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0x7ffffffffffed);
  uint64_t x27, uint8_t x28 = addcarryx_u51(0x0, x10, x25);
  uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/montgomery32_2e127m1/feadd.c b/src/Specific/montgomery32_2e127m1/feadd.c
index ab8a6011e..83328c32f 100644
--- a/src/Specific/montgomery32_2e127m1/feadd.c
+++ b/src/Specific/montgomery32_2e127m1/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint32_t out[4], const uint32_t in1[4], const uint32_t in2[4])
   { uint32_t x35; uint8_t x36 = _subborrow_u32(x33, x23, 0xffffffff, &x35);
   { uint32_t x38; uint8_t x39 = _subborrow_u32(x36, x26, 0x7fffffff, &x38);
   { uint32_t _; uint8_t x42 = _subborrow_u32(x39, x27, 0x0, &_);
-  { uint32_t x43 = cmovznz(x42, x38, x26);
-  { uint32_t x44 = cmovznz(x42, x35, x23);
-  { uint32_t x45 = cmovznz(x42, x32, x20);
-  { uint32_t x46 = cmovznz(x42, x29, x17);
+  { uint32_t x43 = cmovznz32(x42, x38, x26);
+  { uint32_t x44 = cmovznz32(x42, x35, x23);
+  { uint32_t x45 = cmovznz32(x42, x32, x20);
+  { uint32_t x46 = cmovznz32(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery32_2e127m1/feaddDisplay.log b/src/Specific/montgomery32_2e127m1/feaddDisplay.log
index a487bc1da..6368982f5 100644
--- a/src/Specific/montgomery32_2e127m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e127m1/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint32_t x35, uint8_t x36 = subborrow_u32(x33, x23, 0xffffffff);
  uint32_t x38, uint8_t x39 = subborrow_u32(x36, x26, 0x7fffffff);
  uint32_t _, uint8_t x42 = subborrow_u32(x39, x27, 0x0);
- uint32_t x43 = cmovznz(x42, x38, x26);
- uint32_t x44 = cmovznz(x42, x35, x23);
- uint32_t x45 = cmovznz(x42, x32, x20);
- uint32_t x46 = cmovznz(x42, x29, x17);
+ uint32_t x43 = cmovznz32(x42, x38, x26);
+ uint32_t x44 = cmovznz32(x42, x35, x23);
+ uint32_t x45 = cmovznz32(x42, x32, x20);
+ uint32_t x46 = cmovznz32(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e127m1/femul.c b/src/Specific/montgomery32_2e127m1/femul.c
index 4eb70f7e4..49619dbef 100644
--- a/src/Specific/montgomery32_2e127m1/femul.c
+++ b/src/Specific/montgomery32_2e127m1/femul.c
@@ -114,10 +114,10 @@ static void femul(uint32_t out[4], const uint32_t in1[4], const uint32_t in2[4])
   { uint32_t x323; uint8_t x324 = _subborrow_u32(x321, x310, 0xffffffff, &x323);
   { uint32_t x326; uint8_t x327 = _subborrow_u32(x324, x313, 0x7fffffff, &x326);
   { uint32_t _; uint8_t x330 = _subborrow_u32(x327, x315, 0x0, &_);
-  { uint32_t x331 = cmovznz(x330, x326, x313);
-  { uint32_t x332 = cmovznz(x330, x323, x310);
-  { uint32_t x333 = cmovznz(x330, x320, x307);
-  { uint32_t x334 = cmovznz(x330, x317, x304);
+  { uint32_t x331 = cmovznz32(x330, x326, x313);
+  { uint32_t x332 = cmovznz32(x330, x323, x310);
+  { uint32_t x333 = cmovznz32(x330, x320, x307);
+  { uint32_t x334 = cmovznz32(x330, x317, x304);
   out[0] = x334;
   out[1] = x333;
   out[2] = x332;
diff --git a/src/Specific/montgomery32_2e127m1/femulDisplay.log b/src/Specific/montgomery32_2e127m1/femulDisplay.log
index 1a6468cdc..0fa546aca 100644
--- a/src/Specific/montgomery32_2e127m1/femulDisplay.log
+++ b/src/Specific/montgomery32_2e127m1/femulDisplay.log
@@ -109,10 +109,10 @@ Interp-η
  uint32_t x323, uint8_t x324 = subborrow_u32(x321, x310, 0xffffffff);
  uint32_t x326, uint8_t x327 = subborrow_u32(x324, x313, 0x7fffffff);
  uint32_t _, uint8_t x330 = subborrow_u32(x327, x315, 0x0);
- uint32_t x331 = cmovznz(x330, x326, x313);
- uint32_t x332 = cmovznz(x330, x323, x310);
- uint32_t x333 = cmovznz(x330, x320, x307);
- uint32_t x334 = cmovznz(x330, x317, x304);
+ uint32_t x331 = cmovznz32(x330, x326, x313);
+ uint32_t x332 = cmovznz32(x330, x323, x310);
+ uint32_t x333 = cmovznz32(x330, x320, x307);
+ uint32_t x334 = cmovznz32(x330, x317, x304);
  return (x331, x332, x333, x334))
 (x, x0)%core
      : word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e127m1/feopp.c b/src/Specific/montgomery32_2e127m1/feopp.c
index 92d7b9903..4109fa0d9 100644
--- a/src/Specific/montgomery32_2e127m1/feopp.c
+++ b/src/Specific/montgomery32_2e127m1/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint32_t out[4], const uint32_t in1[4]) {
   { uint32_t x11; uint8_t x12 = _subborrow_u32(x9, 0x0, x4, &x11);
   { uint32_t x14; uint8_t x15 = _subborrow_u32(x12, 0x0, x6, &x14);
   { uint32_t x17; uint8_t x18 = _subborrow_u32(x15, 0x0, x5, &x17);
-  { uint32_t x19 = (uint32_t)cmovznz(x18, 0x0, 0xffffffff);
+  { uint32_t x19 = cmovznz32(x18, 0x0, 0xffffffff);
   { uint32_t x20 = (x19 & 0xffffffff);
   { uint32_t x22; uint8_t x23 = _addcarryx_u32(0x0, x8, x20, &x22);
   { uint32_t x24 = (x19 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e127m1/feoppDisplay.log b/src/Specific/montgomery32_2e127m1/feoppDisplay.log
index 25a30ff8a..d9265af7f 100644
--- a/src/Specific/montgomery32_2e127m1/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e127m1/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint32_t x11, uint8_t x12 = subborrow_u32(x9, 0x0, x4);
  uint32_t x14, uint8_t x15 = subborrow_u32(x12, 0x0, x6);
  uint32_t x17, uint8_t x18 = subborrow_u32(x15, 0x0, x5);
- uint32_t x19 = (uint32_t)cmovznz(x18, 0x0, 0xffffffff);
+ uint32_t x19 = cmovznz32(x18, 0x0, 0xffffffff);
  uint32_t x20 = (x19 & 0xffffffff);
  uint32_t x22, uint8_t x23 = addcarryx_u32(0x0, x8, x20);
  uint32_t x24 = (x19 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e127m1/fesub.c b/src/Specific/montgomery32_2e127m1/fesub.c
index 1277222cd..8e0bc2a3b 100644
--- a/src/Specific/montgomery32_2e127m1/fesub.c
+++ b/src/Specific/montgomery32_2e127m1/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint32_t out[4], const uint32_t in1[4], const uint32_t in2[4])
   { uint32_t x20; uint8_t x21 = _subborrow_u32(x18, x7, x13, &x20);
   { uint32_t x23; uint8_t x24 = _subborrow_u32(x21, x9, x15, &x23);
   { uint32_t x26; uint8_t x27 = _subborrow_u32(x24, x8, x14, &x26);
-  { uint32_t x28 = (uint32_t)cmovznz(x27, 0x0, 0xffffffff);
+  { uint32_t x28 = cmovznz32(x27, 0x0, 0xffffffff);
   { uint32_t x29 = (x28 & 0xffffffff);
   { uint32_t x31; uint8_t x32 = _addcarryx_u32(0x0, x17, x29, &x31);
   { uint32_t x33 = (x28 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e127m1/fesubDisplay.log b/src/Specific/montgomery32_2e127m1/fesubDisplay.log
index d96d6b732..ac3d00bf1 100644
--- a/src/Specific/montgomery32_2e127m1/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e127m1/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint32_t x20, uint8_t x21 = subborrow_u32(x18, x7, x13);
  uint32_t x23, uint8_t x24 = subborrow_u32(x21, x9, x15);
  uint32_t x26, uint8_t x27 = subborrow_u32(x24, x8, x14);
- uint32_t x28 = (uint32_t)cmovznz(x27, 0x0, 0xffffffff);
+ uint32_t x28 = cmovznz32(x27, 0x0, 0xffffffff);
  uint32_t x29 = (x28 & 0xffffffff);
  uint32_t x31, uint8_t x32 = addcarryx_u32(0x0, x17, x29);
  uint32_t x33 = (x28 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e129m25/feadd.c b/src/Specific/montgomery32_2e129m25/feadd.c
index 45c2ffda2..44c8e70d7 100644
--- a/src/Specific/montgomery32_2e129m25/feadd.c
+++ b/src/Specific/montgomery32_2e129m25/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x45; uint8_t x46 = _subborrow_u32(x43, x30, 0xffffffff, &x45);
   { uint32_t x48; uint8_t x49 = _subborrow_u32(x46, x33, 0x1, &x48);
   { uint32_t _; uint8_t x52 = _subborrow_u32(x49, x34, 0x0, &_);
-  { uint32_t x53 = cmovznz(x52, x48, x33);
-  { uint32_t x54 = cmovznz(x52, x45, x30);
-  { uint32_t x55 = cmovznz(x52, x42, x27);
-  { uint32_t x56 = cmovznz(x52, x39, x24);
-  { uint32_t x57 = cmovznz(x52, x36, x21);
+  { uint32_t x53 = cmovznz32(x52, x48, x33);
+  { uint32_t x54 = cmovznz32(x52, x45, x30);
+  { uint32_t x55 = cmovznz32(x52, x42, x27);
+  { uint32_t x56 = cmovznz32(x52, x39, x24);
+  { uint32_t x57 = cmovznz32(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery32_2e129m25/feaddDisplay.log b/src/Specific/montgomery32_2e129m25/feaddDisplay.log
index 349e6a526..aed0a7f58 100644
--- a/src/Specific/montgomery32_2e129m25/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e129m25/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint32_t x45, uint8_t x46 = subborrow_u32(x43, x30, 0xffffffff);
  uint32_t x48, uint8_t x49 = subborrow_u32(x46, x33, 0x1);
  uint32_t _, uint8_t x52 = subborrow_u32(x49, x34, 0x0);
- uint32_t x53 = cmovznz(x52, x48, x33);
- uint32_t x54 = cmovznz(x52, x45, x30);
- uint32_t x55 = cmovznz(x52, x42, x27);
- uint32_t x56 = cmovznz(x52, x39, x24);
- uint32_t x57 = cmovznz(x52, x36, x21);
+ uint32_t x53 = cmovznz32(x52, x48, x33);
+ uint32_t x54 = cmovznz32(x52, x45, x30);
+ uint32_t x55 = cmovznz32(x52, x42, x27);
+ uint32_t x56 = cmovznz32(x52, x39, x24);
+ uint32_t x57 = cmovznz32(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e129m25/femul.c b/src/Specific/montgomery32_2e129m25/femul.c
index 2b111a22e..f03dbf6a8 100644
--- a/src/Specific/montgomery32_2e129m25/femul.c
+++ b/src/Specific/montgomery32_2e129m25/femul.c
@@ -168,11 +168,11 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x481; uint8_t x482 = _subborrow_u32(x479, x465, 0xffffffff, &x481);
   { uint32_t x484; uint8_t x485 = _subborrow_u32(x482, x468, 0x1, &x484);
   { uint32_t _; uint8_t x488 = _subborrow_u32(x485, x470, 0x0, &_);
-  { uint32_t x489 = cmovznz(x488, x484, x468);
-  { uint32_t x490 = cmovznz(x488, x481, x465);
-  { uint32_t x491 = cmovznz(x488, x478, x462);
-  { uint32_t x492 = cmovznz(x488, x475, x459);
-  { uint32_t x493 = cmovznz(x488, x472, x456);
+  { uint32_t x489 = cmovznz32(x488, x484, x468);
+  { uint32_t x490 = cmovznz32(x488, x481, x465);
+  { uint32_t x491 = cmovznz32(x488, x478, x462);
+  { uint32_t x492 = cmovznz32(x488, x475, x459);
+  { uint32_t x493 = cmovznz32(x488, x472, x456);
   out[0] = x493;
   out[1] = x492;
   out[2] = x491;
diff --git a/src/Specific/montgomery32_2e129m25/femulDisplay.log b/src/Specific/montgomery32_2e129m25/femulDisplay.log
index 96d487ed2..15f5ce352 100644
--- a/src/Specific/montgomery32_2e129m25/femulDisplay.log
+++ b/src/Specific/montgomery32_2e129m25/femulDisplay.log
@@ -161,11 +161,11 @@ Interp-η
  uint32_t x481, uint8_t x482 = subborrow_u32(x479, x465, 0xffffffff);
  uint32_t x484, uint8_t x485 = subborrow_u32(x482, x468, 0x1);
  uint32_t _, uint8_t x488 = subborrow_u32(x485, x470, 0x0);
- uint32_t x489 = cmovznz(x488, x484, x468);
- uint32_t x490 = cmovznz(x488, x481, x465);
- uint32_t x491 = cmovznz(x488, x478, x462);
- uint32_t x492 = cmovznz(x488, x475, x459);
- uint32_t x493 = cmovznz(x488, x472, x456);
+ uint32_t x489 = cmovznz32(x488, x484, x468);
+ uint32_t x490 = cmovznz32(x488, x481, x465);
+ uint32_t x491 = cmovznz32(x488, x478, x462);
+ uint32_t x492 = cmovznz32(x488, x475, x459);
+ uint32_t x493 = cmovznz32(x488, x472, x456);
  return (x489, x490, x491, x492, x493))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e129m25/feopp.c b/src/Specific/montgomery32_2e129m25/feopp.c
index c1ce379d3..01cd3f66d 100644
--- a/src/Specific/montgomery32_2e129m25/feopp.c
+++ b/src/Specific/montgomery32_2e129m25/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16; uint8_t x17 = _subborrow_u32(x14, 0x0, x6, &x16);
   { uint32_t x19; uint8_t x20 = _subborrow_u32(x17, 0x0, x8, &x19);
   { uint32_t x22; uint8_t x23 = _subborrow_u32(x20, 0x0, x7, &x22);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0xffffffe7);
   { uint32_t x27; uint8_t x28 = _addcarryx_u32(0x0, x10, x25, &x27);
   { uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e129m25/feoppDisplay.log b/src/Specific/montgomery32_2e129m25/feoppDisplay.log
index 3bd4510e2..fb5260ead 100644
--- a/src/Specific/montgomery32_2e129m25/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e129m25/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = subborrow_u32(x14, 0x0, x6);
  uint32_t x19, uint8_t x20 = subborrow_u32(x17, 0x0, x8);
  uint32_t x22, uint8_t x23 = subborrow_u32(x20, 0x0, x7);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0xffffffe7);
  uint32_t x27, uint8_t x28 = addcarryx_u32(0x0, x10, x25);
  uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e129m25/fesub.c b/src/Specific/montgomery32_2e129m25/fesub.c
index 119f0d7da..f7c5313f1 100644
--- a/src/Specific/montgomery32_2e129m25/fesub.c
+++ b/src/Specific/montgomery32_2e129m25/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, x9, x17, &x27);
   { uint32_t x30; uint8_t x31 = _subborrow_u32(x28, x11, x19, &x30);
   { uint32_t x33; uint8_t x34 = _subborrow_u32(x31, x10, x18, &x33);
-  { uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+  { uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
   { uint32_t x36 = (x35 & 0xffffffe7);
   { uint32_t x38; uint8_t x39 = _addcarryx_u32(0x0, x21, x36, &x38);
   { uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e129m25/fesubDisplay.log b/src/Specific/montgomery32_2e129m25/fesubDisplay.log
index 7fbd2bb56..fa6a3160e 100644
--- a/src/Specific/montgomery32_2e129m25/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e129m25/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, x9, x17);
  uint32_t x30, uint8_t x31 = subborrow_u32(x28, x11, x19);
  uint32_t x33, uint8_t x34 = subborrow_u32(x31, x10, x18);
- uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+ uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
  uint32_t x36 = (x35 & 0xffffffe7);
  uint32_t x38, uint8_t x39 = addcarryx_u32(0x0, x21, x36);
  uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e130m5/feadd.c b/src/Specific/montgomery32_2e130m5/feadd.c
index 29e05d1ec..89b9fbad7 100644
--- a/src/Specific/montgomery32_2e130m5/feadd.c
+++ b/src/Specific/montgomery32_2e130m5/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x45; uint8_t x46 = _subborrow_u32(x43, x30, 0xffffffff, &x45);
   { uint32_t x48; uint8_t x49 = _subborrow_u32(x46, x33, 0x3, &x48);
   { uint32_t _; uint8_t x52 = _subborrow_u32(x49, x34, 0x0, &_);
-  { uint32_t x53 = cmovznz(x52, x48, x33);
-  { uint32_t x54 = cmovznz(x52, x45, x30);
-  { uint32_t x55 = cmovznz(x52, x42, x27);
-  { uint32_t x56 = cmovznz(x52, x39, x24);
-  { uint32_t x57 = cmovznz(x52, x36, x21);
+  { uint32_t x53 = cmovznz32(x52, x48, x33);
+  { uint32_t x54 = cmovznz32(x52, x45, x30);
+  { uint32_t x55 = cmovznz32(x52, x42, x27);
+  { uint32_t x56 = cmovznz32(x52, x39, x24);
+  { uint32_t x57 = cmovznz32(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery32_2e130m5/feaddDisplay.log b/src/Specific/montgomery32_2e130m5/feaddDisplay.log
index dd841f58e..3fbc68015 100644
--- a/src/Specific/montgomery32_2e130m5/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e130m5/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint32_t x45, uint8_t x46 = subborrow_u32(x43, x30, 0xffffffff);
  uint32_t x48, uint8_t x49 = subborrow_u32(x46, x33, 0x3);
  uint32_t _, uint8_t x52 = subborrow_u32(x49, x34, 0x0);
- uint32_t x53 = cmovznz(x52, x48, x33);
- uint32_t x54 = cmovznz(x52, x45, x30);
- uint32_t x55 = cmovznz(x52, x42, x27);
- uint32_t x56 = cmovznz(x52, x39, x24);
- uint32_t x57 = cmovznz(x52, x36, x21);
+ uint32_t x53 = cmovznz32(x52, x48, x33);
+ uint32_t x54 = cmovznz32(x52, x45, x30);
+ uint32_t x55 = cmovznz32(x52, x42, x27);
+ uint32_t x56 = cmovznz32(x52, x39, x24);
+ uint32_t x57 = cmovznz32(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e130m5/femul.c b/src/Specific/montgomery32_2e130m5/femul.c
index 9fcadff88..dad2ff269 100644
--- a/src/Specific/montgomery32_2e130m5/femul.c
+++ b/src/Specific/montgomery32_2e130m5/femul.c
@@ -178,11 +178,11 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x501; uint8_t x502 = _subborrow_u32(x499, x485, 0xffffffff, &x501);
   { uint32_t x504; uint8_t x505 = _subborrow_u32(x502, x488, 0x3, &x504);
   { uint32_t _; uint8_t x508 = _subborrow_u32(x505, x490, 0x0, &_);
-  { uint32_t x509 = cmovznz(x508, x504, x488);
-  { uint32_t x510 = cmovznz(x508, x501, x485);
-  { uint32_t x511 = cmovznz(x508, x498, x482);
-  { uint32_t x512 = cmovznz(x508, x495, x479);
-  { uint32_t x513 = cmovznz(x508, x492, x476);
+  { uint32_t x509 = cmovznz32(x508, x504, x488);
+  { uint32_t x510 = cmovznz32(x508, x501, x485);
+  { uint32_t x511 = cmovznz32(x508, x498, x482);
+  { uint32_t x512 = cmovznz32(x508, x495, x479);
+  { uint32_t x513 = cmovznz32(x508, x492, x476);
   out[0] = x513;
   out[1] = x512;
   out[2] = x511;
diff --git a/src/Specific/montgomery32_2e130m5/femulDisplay.log b/src/Specific/montgomery32_2e130m5/femulDisplay.log
index 7d2e6f3bf..913522927 100644
--- a/src/Specific/montgomery32_2e130m5/femulDisplay.log
+++ b/src/Specific/montgomery32_2e130m5/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint32_t x501, uint8_t x502 = subborrow_u32(x499, x485, 0xffffffff);
  uint32_t x504, uint8_t x505 = subborrow_u32(x502, x488, 0x3);
  uint32_t _, uint8_t x508 = subborrow_u32(x505, x490, 0x0);
- uint32_t x509 = cmovznz(x508, x504, x488);
- uint32_t x510 = cmovznz(x508, x501, x485);
- uint32_t x511 = cmovznz(x508, x498, x482);
- uint32_t x512 = cmovznz(x508, x495, x479);
- uint32_t x513 = cmovznz(x508, x492, x476);
+ uint32_t x509 = cmovznz32(x508, x504, x488);
+ uint32_t x510 = cmovznz32(x508, x501, x485);
+ uint32_t x511 = cmovznz32(x508, x498, x482);
+ uint32_t x512 = cmovznz32(x508, x495, x479);
+ uint32_t x513 = cmovznz32(x508, x492, x476);
  return (x509, x510, x511, x512, x513))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e130m5/feopp.c b/src/Specific/montgomery32_2e130m5/feopp.c
index 2feb96b86..52806d593 100644
--- a/src/Specific/montgomery32_2e130m5/feopp.c
+++ b/src/Specific/montgomery32_2e130m5/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16; uint8_t x17 = _subborrow_u32(x14, 0x0, x6, &x16);
   { uint32_t x19; uint8_t x20 = _subborrow_u32(x17, 0x0, x8, &x19);
   { uint32_t x22; uint8_t x23 = _subborrow_u32(x20, 0x0, x7, &x22);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0xfffffffb);
   { uint32_t x27; uint8_t x28 = _addcarryx_u32(0x0, x10, x25, &x27);
   { uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e130m5/feoppDisplay.log b/src/Specific/montgomery32_2e130m5/feoppDisplay.log
index 75b00ac19..3f460c1dd 100644
--- a/src/Specific/montgomery32_2e130m5/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e130m5/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = subborrow_u32(x14, 0x0, x6);
  uint32_t x19, uint8_t x20 = subborrow_u32(x17, 0x0, x8);
  uint32_t x22, uint8_t x23 = subborrow_u32(x20, 0x0, x7);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0xfffffffb);
  uint32_t x27, uint8_t x28 = addcarryx_u32(0x0, x10, x25);
  uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e130m5/fesub.c b/src/Specific/montgomery32_2e130m5/fesub.c
index a5c5f00d5..fed7c8420 100644
--- a/src/Specific/montgomery32_2e130m5/fesub.c
+++ b/src/Specific/montgomery32_2e130m5/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, x9, x17, &x27);
   { uint32_t x30; uint8_t x31 = _subborrow_u32(x28, x11, x19, &x30);
   { uint32_t x33; uint8_t x34 = _subborrow_u32(x31, x10, x18, &x33);
-  { uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+  { uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
   { uint32_t x36 = (x35 & 0xfffffffb);
   { uint32_t x38; uint8_t x39 = _addcarryx_u32(0x0, x21, x36, &x38);
   { uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e130m5/fesubDisplay.log b/src/Specific/montgomery32_2e130m5/fesubDisplay.log
index 31b7bd0dd..e12f2c9c3 100644
--- a/src/Specific/montgomery32_2e130m5/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e130m5/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, x9, x17);
  uint32_t x30, uint8_t x31 = subborrow_u32(x28, x11, x19);
  uint32_t x33, uint8_t x34 = subborrow_u32(x31, x10, x18);
- uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+ uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
  uint32_t x36 = (x35 & 0xfffffffb);
  uint32_t x38, uint8_t x39 = addcarryx_u32(0x0, x21, x36);
  uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e137m13/feadd.c b/src/Specific/montgomery32_2e137m13/feadd.c
index cae1d30a9..9551c2a6f 100644
--- a/src/Specific/montgomery32_2e137m13/feadd.c
+++ b/src/Specific/montgomery32_2e137m13/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x45; uint8_t x46 = _subborrow_u32(x43, x30, 0xffffffff, &x45);
   { uint32_t x48; uint8_t x49 = _subborrow_u32(x46, x33, 0x1ff, &x48);
   { uint32_t _; uint8_t x52 = _subborrow_u32(x49, x34, 0x0, &_);
-  { uint32_t x53 = cmovznz(x52, x48, x33);
-  { uint32_t x54 = cmovznz(x52, x45, x30);
-  { uint32_t x55 = cmovznz(x52, x42, x27);
-  { uint32_t x56 = cmovznz(x52, x39, x24);
-  { uint32_t x57 = cmovznz(x52, x36, x21);
+  { uint32_t x53 = cmovznz32(x52, x48, x33);
+  { uint32_t x54 = cmovznz32(x52, x45, x30);
+  { uint32_t x55 = cmovznz32(x52, x42, x27);
+  { uint32_t x56 = cmovznz32(x52, x39, x24);
+  { uint32_t x57 = cmovznz32(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery32_2e137m13/feaddDisplay.log b/src/Specific/montgomery32_2e137m13/feaddDisplay.log
index ae3fa76fe..ce18e4d1f 100644
--- a/src/Specific/montgomery32_2e137m13/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e137m13/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint32_t x45, uint8_t x46 = subborrow_u32(x43, x30, 0xffffffff);
  uint32_t x48, uint8_t x49 = subborrow_u32(x46, x33, 0x1ff);
  uint32_t _, uint8_t x52 = subborrow_u32(x49, x34, 0x0);
- uint32_t x53 = cmovznz(x52, x48, x33);
- uint32_t x54 = cmovznz(x52, x45, x30);
- uint32_t x55 = cmovznz(x52, x42, x27);
- uint32_t x56 = cmovznz(x52, x39, x24);
- uint32_t x57 = cmovznz(x52, x36, x21);
+ uint32_t x53 = cmovznz32(x52, x48, x33);
+ uint32_t x54 = cmovznz32(x52, x45, x30);
+ uint32_t x55 = cmovznz32(x52, x42, x27);
+ uint32_t x56 = cmovznz32(x52, x39, x24);
+ uint32_t x57 = cmovznz32(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e137m13/femul.c b/src/Specific/montgomery32_2e137m13/femul.c
index fd1e9b76a..95d505d62 100644
--- a/src/Specific/montgomery32_2e137m13/femul.c
+++ b/src/Specific/montgomery32_2e137m13/femul.c
@@ -178,11 +178,11 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x511; uint8_t x512 = _subborrow_u32(x509, x495, 0xffffffff, &x511);
   { uint32_t x514; uint8_t x515 = _subborrow_u32(x512, x498, 0x1ff, &x514);
   { uint32_t _; uint8_t x518 = _subborrow_u32(x515, x500, 0x0, &_);
-  { uint32_t x519 = cmovznz(x518, x514, x498);
-  { uint32_t x520 = cmovznz(x518, x511, x495);
-  { uint32_t x521 = cmovznz(x518, x508, x492);
-  { uint32_t x522 = cmovznz(x518, x505, x489);
-  { uint32_t x523 = cmovznz(x518, x502, x486);
+  { uint32_t x519 = cmovznz32(x518, x514, x498);
+  { uint32_t x520 = cmovznz32(x518, x511, x495);
+  { uint32_t x521 = cmovznz32(x518, x508, x492);
+  { uint32_t x522 = cmovznz32(x518, x505, x489);
+  { uint32_t x523 = cmovznz32(x518, x502, x486);
   out[0] = x523;
   out[1] = x522;
   out[2] = x521;
diff --git a/src/Specific/montgomery32_2e137m13/femulDisplay.log b/src/Specific/montgomery32_2e137m13/femulDisplay.log
index 0e1d03814..e2ecb1b74 100644
--- a/src/Specific/montgomery32_2e137m13/femulDisplay.log
+++ b/src/Specific/montgomery32_2e137m13/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint32_t x511, uint8_t x512 = subborrow_u32(x509, x495, 0xffffffff);
  uint32_t x514, uint8_t x515 = subborrow_u32(x512, x498, 0x1ff);
  uint32_t _, uint8_t x518 = subborrow_u32(x515, x500, 0x0);
- uint32_t x519 = cmovznz(x518, x514, x498);
- uint32_t x520 = cmovznz(x518, x511, x495);
- uint32_t x521 = cmovznz(x518, x508, x492);
- uint32_t x522 = cmovznz(x518, x505, x489);
- uint32_t x523 = cmovznz(x518, x502, x486);
+ uint32_t x519 = cmovznz32(x518, x514, x498);
+ uint32_t x520 = cmovznz32(x518, x511, x495);
+ uint32_t x521 = cmovznz32(x518, x508, x492);
+ uint32_t x522 = cmovznz32(x518, x505, x489);
+ uint32_t x523 = cmovznz32(x518, x502, x486);
  return (x519, x520, x521, x522, x523))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e137m13/feopp.c b/src/Specific/montgomery32_2e137m13/feopp.c
index b0be8f604..39924b58e 100644
--- a/src/Specific/montgomery32_2e137m13/feopp.c
+++ b/src/Specific/montgomery32_2e137m13/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16; uint8_t x17 = _subborrow_u32(x14, 0x0, x6, &x16);
   { uint32_t x19; uint8_t x20 = _subborrow_u32(x17, 0x0, x8, &x19);
   { uint32_t x22; uint8_t x23 = _subborrow_u32(x20, 0x0, x7, &x22);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0xfffffff3);
   { uint32_t x27; uint8_t x28 = _addcarryx_u32(0x0, x10, x25, &x27);
   { uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e137m13/feoppDisplay.log b/src/Specific/montgomery32_2e137m13/feoppDisplay.log
index 0d78fcafe..f1cfb1f67 100644
--- a/src/Specific/montgomery32_2e137m13/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e137m13/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = subborrow_u32(x14, 0x0, x6);
  uint32_t x19, uint8_t x20 = subborrow_u32(x17, 0x0, x8);
  uint32_t x22, uint8_t x23 = subborrow_u32(x20, 0x0, x7);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0xfffffff3);
  uint32_t x27, uint8_t x28 = addcarryx_u32(0x0, x10, x25);
  uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e137m13/fesub.c b/src/Specific/montgomery32_2e137m13/fesub.c
index deafb3894..ee8fe44ce 100644
--- a/src/Specific/montgomery32_2e137m13/fesub.c
+++ b/src/Specific/montgomery32_2e137m13/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, x9, x17, &x27);
   { uint32_t x30; uint8_t x31 = _subborrow_u32(x28, x11, x19, &x30);
   { uint32_t x33; uint8_t x34 = _subborrow_u32(x31, x10, x18, &x33);
-  { uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+  { uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
   { uint32_t x36 = (x35 & 0xfffffff3);
   { uint32_t x38; uint8_t x39 = _addcarryx_u32(0x0, x21, x36, &x38);
   { uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e137m13/fesubDisplay.log b/src/Specific/montgomery32_2e137m13/fesubDisplay.log
index 8b3d79a2b..795077b02 100644
--- a/src/Specific/montgomery32_2e137m13/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e137m13/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, x9, x17);
  uint32_t x30, uint8_t x31 = subborrow_u32(x28, x11, x19);
  uint32_t x33, uint8_t x34 = subborrow_u32(x31, x10, x18);
- uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+ uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
  uint32_t x36 = (x35 & 0xfffffff3);
  uint32_t x38, uint8_t x39 = addcarryx_u32(0x0, x21, x36);
  uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e140m27/feadd.c b/src/Specific/montgomery32_2e140m27/feadd.c
index 3641d2c2c..a836d6e4b 100644
--- a/src/Specific/montgomery32_2e140m27/feadd.c
+++ b/src/Specific/montgomery32_2e140m27/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x45; uint8_t x46 = _subborrow_u32(x43, x30, 0xffffffff, &x45);
   { uint32_t x48; uint8_t x49 = _subborrow_u32(x46, x33, 0xfff, &x48);
   { uint32_t _; uint8_t x52 = _subborrow_u32(x49, x34, 0x0, &_);
-  { uint32_t x53 = cmovznz(x52, x48, x33);
-  { uint32_t x54 = cmovznz(x52, x45, x30);
-  { uint32_t x55 = cmovznz(x52, x42, x27);
-  { uint32_t x56 = cmovznz(x52, x39, x24);
-  { uint32_t x57 = cmovznz(x52, x36, x21);
+  { uint32_t x53 = cmovznz32(x52, x48, x33);
+  { uint32_t x54 = cmovznz32(x52, x45, x30);
+  { uint32_t x55 = cmovznz32(x52, x42, x27);
+  { uint32_t x56 = cmovznz32(x52, x39, x24);
+  { uint32_t x57 = cmovznz32(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery32_2e140m27/feaddDisplay.log b/src/Specific/montgomery32_2e140m27/feaddDisplay.log
index da94797bd..1d528f09a 100644
--- a/src/Specific/montgomery32_2e140m27/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e140m27/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint32_t x45, uint8_t x46 = subborrow_u32(x43, x30, 0xffffffff);
  uint32_t x48, uint8_t x49 = subborrow_u32(x46, x33, 0xfff);
  uint32_t _, uint8_t x52 = subborrow_u32(x49, x34, 0x0);
- uint32_t x53 = cmovznz(x52, x48, x33);
- uint32_t x54 = cmovznz(x52, x45, x30);
- uint32_t x55 = cmovznz(x52, x42, x27);
- uint32_t x56 = cmovznz(x52, x39, x24);
- uint32_t x57 = cmovznz(x52, x36, x21);
+ uint32_t x53 = cmovznz32(x52, x48, x33);
+ uint32_t x54 = cmovznz32(x52, x45, x30);
+ uint32_t x55 = cmovznz32(x52, x42, x27);
+ uint32_t x56 = cmovznz32(x52, x39, x24);
+ uint32_t x57 = cmovznz32(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e140m27/femul.c b/src/Specific/montgomery32_2e140m27/femul.c
index cfb98b534..71d6053f7 100644
--- a/src/Specific/montgomery32_2e140m27/femul.c
+++ b/src/Specific/montgomery32_2e140m27/femul.c
@@ -178,11 +178,11 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x511; uint8_t x512 = _subborrow_u32(x509, x495, 0xffffffff, &x511);
   { uint32_t x514; uint8_t x515 = _subborrow_u32(x512, x498, 0xfff, &x514);
   { uint32_t _; uint8_t x518 = _subborrow_u32(x515, x500, 0x0, &_);
-  { uint32_t x519 = cmovznz(x518, x514, x498);
-  { uint32_t x520 = cmovznz(x518, x511, x495);
-  { uint32_t x521 = cmovznz(x518, x508, x492);
-  { uint32_t x522 = cmovznz(x518, x505, x489);
-  { uint32_t x523 = cmovznz(x518, x502, x486);
+  { uint32_t x519 = cmovznz32(x518, x514, x498);
+  { uint32_t x520 = cmovznz32(x518, x511, x495);
+  { uint32_t x521 = cmovznz32(x518, x508, x492);
+  { uint32_t x522 = cmovznz32(x518, x505, x489);
+  { uint32_t x523 = cmovznz32(x518, x502, x486);
   out[0] = x523;
   out[1] = x522;
   out[2] = x521;
diff --git a/src/Specific/montgomery32_2e140m27/femulDisplay.log b/src/Specific/montgomery32_2e140m27/femulDisplay.log
index 067b3bb93..5dfdbcff6 100644
--- a/src/Specific/montgomery32_2e140m27/femulDisplay.log
+++ b/src/Specific/montgomery32_2e140m27/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint32_t x511, uint8_t x512 = subborrow_u32(x509, x495, 0xffffffff);
  uint32_t x514, uint8_t x515 = subborrow_u32(x512, x498, 0xfff);
  uint32_t _, uint8_t x518 = subborrow_u32(x515, x500, 0x0);
- uint32_t x519 = cmovznz(x518, x514, x498);
- uint32_t x520 = cmovznz(x518, x511, x495);
- uint32_t x521 = cmovznz(x518, x508, x492);
- uint32_t x522 = cmovznz(x518, x505, x489);
- uint32_t x523 = cmovznz(x518, x502, x486);
+ uint32_t x519 = cmovznz32(x518, x514, x498);
+ uint32_t x520 = cmovznz32(x518, x511, x495);
+ uint32_t x521 = cmovznz32(x518, x508, x492);
+ uint32_t x522 = cmovznz32(x518, x505, x489);
+ uint32_t x523 = cmovznz32(x518, x502, x486);
  return (x519, x520, x521, x522, x523))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e140m27/feopp.c b/src/Specific/montgomery32_2e140m27/feopp.c
index c9cb1b8e7..5b9a3606e 100644
--- a/src/Specific/montgomery32_2e140m27/feopp.c
+++ b/src/Specific/montgomery32_2e140m27/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16; uint8_t x17 = _subborrow_u32(x14, 0x0, x6, &x16);
   { uint32_t x19; uint8_t x20 = _subborrow_u32(x17, 0x0, x8, &x19);
   { uint32_t x22; uint8_t x23 = _subborrow_u32(x20, 0x0, x7, &x22);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0xffffffe5);
   { uint32_t x27; uint8_t x28 = _addcarryx_u32(0x0, x10, x25, &x27);
   { uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e140m27/feoppDisplay.log b/src/Specific/montgomery32_2e140m27/feoppDisplay.log
index 24a983b1e..4b3132870 100644
--- a/src/Specific/montgomery32_2e140m27/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e140m27/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = subborrow_u32(x14, 0x0, x6);
  uint32_t x19, uint8_t x20 = subborrow_u32(x17, 0x0, x8);
  uint32_t x22, uint8_t x23 = subborrow_u32(x20, 0x0, x7);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0xffffffe5);
  uint32_t x27, uint8_t x28 = addcarryx_u32(0x0, x10, x25);
  uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e140m27/fesub.c b/src/Specific/montgomery32_2e140m27/fesub.c
index c8ffc90c5..66c4f3cc0 100644
--- a/src/Specific/montgomery32_2e140m27/fesub.c
+++ b/src/Specific/montgomery32_2e140m27/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, x9, x17, &x27);
   { uint32_t x30; uint8_t x31 = _subborrow_u32(x28, x11, x19, &x30);
   { uint32_t x33; uint8_t x34 = _subborrow_u32(x31, x10, x18, &x33);
-  { uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+  { uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
   { uint32_t x36 = (x35 & 0xffffffe5);
   { uint32_t x38; uint8_t x39 = _addcarryx_u32(0x0, x21, x36, &x38);
   { uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e140m27/fesubDisplay.log b/src/Specific/montgomery32_2e140m27/fesubDisplay.log
index 10a4c6b42..f4896928b 100644
--- a/src/Specific/montgomery32_2e140m27/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e140m27/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, x9, x17);
  uint32_t x30, uint8_t x31 = subborrow_u32(x28, x11, x19);
  uint32_t x33, uint8_t x34 = subborrow_u32(x31, x10, x18);
- uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+ uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
  uint32_t x36 = (x35 & 0xffffffe5);
  uint32_t x38, uint8_t x39 = addcarryx_u32(0x0, x21, x36);
  uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e141m9/feadd.c b/src/Specific/montgomery32_2e141m9/feadd.c
index d3b03cb4c..29f2dbfd7 100644
--- a/src/Specific/montgomery32_2e141m9/feadd.c
+++ b/src/Specific/montgomery32_2e141m9/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x45; uint8_t x46 = _subborrow_u32(x43, x30, 0xffffffff, &x45);
   { uint32_t x48; uint8_t x49 = _subborrow_u32(x46, x33, 0x1fff, &x48);
   { uint32_t _; uint8_t x52 = _subborrow_u32(x49, x34, 0x0, &_);
-  { uint32_t x53 = cmovznz(x52, x48, x33);
-  { uint32_t x54 = cmovznz(x52, x45, x30);
-  { uint32_t x55 = cmovznz(x52, x42, x27);
-  { uint32_t x56 = cmovznz(x52, x39, x24);
-  { uint32_t x57 = cmovznz(x52, x36, x21);
+  { uint32_t x53 = cmovznz32(x52, x48, x33);
+  { uint32_t x54 = cmovznz32(x52, x45, x30);
+  { uint32_t x55 = cmovznz32(x52, x42, x27);
+  { uint32_t x56 = cmovznz32(x52, x39, x24);
+  { uint32_t x57 = cmovznz32(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery32_2e141m9/feaddDisplay.log b/src/Specific/montgomery32_2e141m9/feaddDisplay.log
index bbdd9f2e6..5a7279038 100644
--- a/src/Specific/montgomery32_2e141m9/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e141m9/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint32_t x45, uint8_t x46 = subborrow_u32(x43, x30, 0xffffffff);
  uint32_t x48, uint8_t x49 = subborrow_u32(x46, x33, 0x1fff);
  uint32_t _, uint8_t x52 = subborrow_u32(x49, x34, 0x0);
- uint32_t x53 = cmovznz(x52, x48, x33);
- uint32_t x54 = cmovznz(x52, x45, x30);
- uint32_t x55 = cmovznz(x52, x42, x27);
- uint32_t x56 = cmovznz(x52, x39, x24);
- uint32_t x57 = cmovznz(x52, x36, x21);
+ uint32_t x53 = cmovznz32(x52, x48, x33);
+ uint32_t x54 = cmovznz32(x52, x45, x30);
+ uint32_t x55 = cmovznz32(x52, x42, x27);
+ uint32_t x56 = cmovznz32(x52, x39, x24);
+ uint32_t x57 = cmovznz32(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e141m9/femul.c b/src/Specific/montgomery32_2e141m9/femul.c
index cdf89d1fa..1d70a8f0c 100644
--- a/src/Specific/montgomery32_2e141m9/femul.c
+++ b/src/Specific/montgomery32_2e141m9/femul.c
@@ -178,11 +178,11 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x511; uint8_t x512 = _subborrow_u32(x509, x495, 0xffffffff, &x511);
   { uint32_t x514; uint8_t x515 = _subborrow_u32(x512, x498, 0x1fff, &x514);
   { uint32_t _; uint8_t x518 = _subborrow_u32(x515, x500, 0x0, &_);
-  { uint32_t x519 = cmovznz(x518, x514, x498);
-  { uint32_t x520 = cmovznz(x518, x511, x495);
-  { uint32_t x521 = cmovznz(x518, x508, x492);
-  { uint32_t x522 = cmovznz(x518, x505, x489);
-  { uint32_t x523 = cmovznz(x518, x502, x486);
+  { uint32_t x519 = cmovznz32(x518, x514, x498);
+  { uint32_t x520 = cmovznz32(x518, x511, x495);
+  { uint32_t x521 = cmovznz32(x518, x508, x492);
+  { uint32_t x522 = cmovznz32(x518, x505, x489);
+  { uint32_t x523 = cmovznz32(x518, x502, x486);
   out[0] = x523;
   out[1] = x522;
   out[2] = x521;
diff --git a/src/Specific/montgomery32_2e141m9/femulDisplay.log b/src/Specific/montgomery32_2e141m9/femulDisplay.log
index 83a6adee3..de7cb15c0 100644
--- a/src/Specific/montgomery32_2e141m9/femulDisplay.log
+++ b/src/Specific/montgomery32_2e141m9/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint32_t x511, uint8_t x512 = subborrow_u32(x509, x495, 0xffffffff);
  uint32_t x514, uint8_t x515 = subborrow_u32(x512, x498, 0x1fff);
  uint32_t _, uint8_t x518 = subborrow_u32(x515, x500, 0x0);
- uint32_t x519 = cmovznz(x518, x514, x498);
- uint32_t x520 = cmovznz(x518, x511, x495);
- uint32_t x521 = cmovznz(x518, x508, x492);
- uint32_t x522 = cmovznz(x518, x505, x489);
- uint32_t x523 = cmovznz(x518, x502, x486);
+ uint32_t x519 = cmovznz32(x518, x514, x498);
+ uint32_t x520 = cmovznz32(x518, x511, x495);
+ uint32_t x521 = cmovznz32(x518, x508, x492);
+ uint32_t x522 = cmovznz32(x518, x505, x489);
+ uint32_t x523 = cmovznz32(x518, x502, x486);
  return (x519, x520, x521, x522, x523))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e141m9/feopp.c b/src/Specific/montgomery32_2e141m9/feopp.c
index a9badfe08..1df743151 100644
--- a/src/Specific/montgomery32_2e141m9/feopp.c
+++ b/src/Specific/montgomery32_2e141m9/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16; uint8_t x17 = _subborrow_u32(x14, 0x0, x6, &x16);
   { uint32_t x19; uint8_t x20 = _subborrow_u32(x17, 0x0, x8, &x19);
   { uint32_t x22; uint8_t x23 = _subborrow_u32(x20, 0x0, x7, &x22);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0xfffffff7);
   { uint32_t x27; uint8_t x28 = _addcarryx_u32(0x0, x10, x25, &x27);
   { uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e141m9/feoppDisplay.log b/src/Specific/montgomery32_2e141m9/feoppDisplay.log
index 237df3b24..0bb6e4ef5 100644
--- a/src/Specific/montgomery32_2e141m9/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e141m9/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = subborrow_u32(x14, 0x0, x6);
  uint32_t x19, uint8_t x20 = subborrow_u32(x17, 0x0, x8);
  uint32_t x22, uint8_t x23 = subborrow_u32(x20, 0x0, x7);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0xfffffff7);
  uint32_t x27, uint8_t x28 = addcarryx_u32(0x0, x10, x25);
  uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e141m9/fesub.c b/src/Specific/montgomery32_2e141m9/fesub.c
index 162164a3e..ac66bcd49 100644
--- a/src/Specific/montgomery32_2e141m9/fesub.c
+++ b/src/Specific/montgomery32_2e141m9/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, x9, x17, &x27);
   { uint32_t x30; uint8_t x31 = _subborrow_u32(x28, x11, x19, &x30);
   { uint32_t x33; uint8_t x34 = _subborrow_u32(x31, x10, x18, &x33);
-  { uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+  { uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
   { uint32_t x36 = (x35 & 0xfffffff7);
   { uint32_t x38; uint8_t x39 = _addcarryx_u32(0x0, x21, x36, &x38);
   { uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e141m9/fesubDisplay.log b/src/Specific/montgomery32_2e141m9/fesubDisplay.log
index f3fadf242..68b2db085 100644
--- a/src/Specific/montgomery32_2e141m9/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e141m9/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, x9, x17);
  uint32_t x30, uint8_t x31 = subborrow_u32(x28, x11, x19);
  uint32_t x33, uint8_t x34 = subborrow_u32(x31, x10, x18);
- uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+ uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
  uint32_t x36 = (x35 & 0xfffffff7);
  uint32_t x38, uint8_t x39 = addcarryx_u32(0x0, x21, x36);
  uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e150m3/feadd.c b/src/Specific/montgomery32_2e150m3/feadd.c
index 4315fde8b..9a127229b 100644
--- a/src/Specific/montgomery32_2e150m3/feadd.c
+++ b/src/Specific/montgomery32_2e150m3/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x45; uint8_t x46 = _subborrow_u32(x43, x30, 0xffffffff, &x45);
   { uint32_t x48; uint8_t x49 = _subborrow_u32(x46, x33, 0x3fffff, &x48);
   { uint32_t _; uint8_t x52 = _subborrow_u32(x49, x34, 0x0, &_);
-  { uint32_t x53 = cmovznz(x52, x48, x33);
-  { uint32_t x54 = cmovznz(x52, x45, x30);
-  { uint32_t x55 = cmovznz(x52, x42, x27);
-  { uint32_t x56 = cmovznz(x52, x39, x24);
-  { uint32_t x57 = cmovznz(x52, x36, x21);
+  { uint32_t x53 = cmovznz32(x52, x48, x33);
+  { uint32_t x54 = cmovznz32(x52, x45, x30);
+  { uint32_t x55 = cmovznz32(x52, x42, x27);
+  { uint32_t x56 = cmovznz32(x52, x39, x24);
+  { uint32_t x57 = cmovznz32(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery32_2e150m3/feaddDisplay.log b/src/Specific/montgomery32_2e150m3/feaddDisplay.log
index ecc4bccac..2633d1b6d 100644
--- a/src/Specific/montgomery32_2e150m3/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e150m3/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint32_t x45, uint8_t x46 = subborrow_u32(x43, x30, 0xffffffff);
  uint32_t x48, uint8_t x49 = subborrow_u32(x46, x33, 0x3fffff);
  uint32_t _, uint8_t x52 = subborrow_u32(x49, x34, 0x0);
- uint32_t x53 = cmovznz(x52, x48, x33);
- uint32_t x54 = cmovznz(x52, x45, x30);
- uint32_t x55 = cmovznz(x52, x42, x27);
- uint32_t x56 = cmovznz(x52, x39, x24);
- uint32_t x57 = cmovznz(x52, x36, x21);
+ uint32_t x53 = cmovznz32(x52, x48, x33);
+ uint32_t x54 = cmovznz32(x52, x45, x30);
+ uint32_t x55 = cmovznz32(x52, x42, x27);
+ uint32_t x56 = cmovznz32(x52, x39, x24);
+ uint32_t x57 = cmovznz32(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e150m3/femul.c b/src/Specific/montgomery32_2e150m3/femul.c
index e9d0ccd9d..a7b4e9f8f 100644
--- a/src/Specific/montgomery32_2e150m3/femul.c
+++ b/src/Specific/montgomery32_2e150m3/femul.c
@@ -178,11 +178,11 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x511; uint8_t x512 = _subborrow_u32(x509, x495, 0xffffffff, &x511);
   { uint32_t x514; uint8_t x515 = _subborrow_u32(x512, x498, 0x3fffff, &x514);
   { uint32_t _; uint8_t x518 = _subborrow_u32(x515, x500, 0x0, &_);
-  { uint32_t x519 = cmovznz(x518, x514, x498);
-  { uint32_t x520 = cmovznz(x518, x511, x495);
-  { uint32_t x521 = cmovznz(x518, x508, x492);
-  { uint32_t x522 = cmovznz(x518, x505, x489);
-  { uint32_t x523 = cmovznz(x518, x502, x486);
+  { uint32_t x519 = cmovznz32(x518, x514, x498);
+  { uint32_t x520 = cmovznz32(x518, x511, x495);
+  { uint32_t x521 = cmovznz32(x518, x508, x492);
+  { uint32_t x522 = cmovznz32(x518, x505, x489);
+  { uint32_t x523 = cmovznz32(x518, x502, x486);
   out[0] = x523;
   out[1] = x522;
   out[2] = x521;
diff --git a/src/Specific/montgomery32_2e150m3/femulDisplay.log b/src/Specific/montgomery32_2e150m3/femulDisplay.log
index 281cdce19..6258382e3 100644
--- a/src/Specific/montgomery32_2e150m3/femulDisplay.log
+++ b/src/Specific/montgomery32_2e150m3/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint32_t x511, uint8_t x512 = subborrow_u32(x509, x495, 0xffffffff);
  uint32_t x514, uint8_t x515 = subborrow_u32(x512, x498, 0x3fffff);
  uint32_t _, uint8_t x518 = subborrow_u32(x515, x500, 0x0);
- uint32_t x519 = cmovznz(x518, x514, x498);
- uint32_t x520 = cmovznz(x518, x511, x495);
- uint32_t x521 = cmovznz(x518, x508, x492);
- uint32_t x522 = cmovznz(x518, x505, x489);
- uint32_t x523 = cmovznz(x518, x502, x486);
+ uint32_t x519 = cmovznz32(x518, x514, x498);
+ uint32_t x520 = cmovznz32(x518, x511, x495);
+ uint32_t x521 = cmovznz32(x518, x508, x492);
+ uint32_t x522 = cmovznz32(x518, x505, x489);
+ uint32_t x523 = cmovznz32(x518, x502, x486);
  return (x519, x520, x521, x522, x523))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e150m3/feopp.c b/src/Specific/montgomery32_2e150m3/feopp.c
index 9a5050270..d20b45d9f 100644
--- a/src/Specific/montgomery32_2e150m3/feopp.c
+++ b/src/Specific/montgomery32_2e150m3/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16; uint8_t x17 = _subborrow_u32(x14, 0x0, x6, &x16);
   { uint32_t x19; uint8_t x20 = _subborrow_u32(x17, 0x0, x8, &x19);
   { uint32_t x22; uint8_t x23 = _subborrow_u32(x20, 0x0, x7, &x22);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0xfffffffd);
   { uint32_t x27; uint8_t x28 = _addcarryx_u32(0x0, x10, x25, &x27);
   { uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e150m3/feoppDisplay.log b/src/Specific/montgomery32_2e150m3/feoppDisplay.log
index 73875b2fe..15ae1a066 100644
--- a/src/Specific/montgomery32_2e150m3/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e150m3/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = subborrow_u32(x14, 0x0, x6);
  uint32_t x19, uint8_t x20 = subborrow_u32(x17, 0x0, x8);
  uint32_t x22, uint8_t x23 = subborrow_u32(x20, 0x0, x7);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0xfffffffd);
  uint32_t x27, uint8_t x28 = addcarryx_u32(0x0, x10, x25);
  uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e150m3/fesub.c b/src/Specific/montgomery32_2e150m3/fesub.c
index f62237483..4de3e1ed2 100644
--- a/src/Specific/montgomery32_2e150m3/fesub.c
+++ b/src/Specific/montgomery32_2e150m3/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, x9, x17, &x27);
   { uint32_t x30; uint8_t x31 = _subborrow_u32(x28, x11, x19, &x30);
   { uint32_t x33; uint8_t x34 = _subborrow_u32(x31, x10, x18, &x33);
-  { uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+  { uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
   { uint32_t x36 = (x35 & 0xfffffffd);
   { uint32_t x38; uint8_t x39 = _addcarryx_u32(0x0, x21, x36, &x38);
   { uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e150m3/fesubDisplay.log b/src/Specific/montgomery32_2e150m3/fesubDisplay.log
index cfede3d05..9fe6254c8 100644
--- a/src/Specific/montgomery32_2e150m3/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e150m3/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, x9, x17);
  uint32_t x30, uint8_t x31 = subborrow_u32(x28, x11, x19);
  uint32_t x33, uint8_t x34 = subborrow_u32(x31, x10, x18);
- uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+ uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
  uint32_t x36 = (x35 & 0xfffffffd);
  uint32_t x38, uint8_t x39 = addcarryx_u32(0x0, x21, x36);
  uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e150m5/feadd.c b/src/Specific/montgomery32_2e150m5/feadd.c
index d39f224e8..6101067bb 100644
--- a/src/Specific/montgomery32_2e150m5/feadd.c
+++ b/src/Specific/montgomery32_2e150m5/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x45; uint8_t x46 = _subborrow_u32(x43, x30, 0xffffffff, &x45);
   { uint32_t x48; uint8_t x49 = _subborrow_u32(x46, x33, 0x3fffff, &x48);
   { uint32_t _; uint8_t x52 = _subborrow_u32(x49, x34, 0x0, &_);
-  { uint32_t x53 = cmovznz(x52, x48, x33);
-  { uint32_t x54 = cmovznz(x52, x45, x30);
-  { uint32_t x55 = cmovznz(x52, x42, x27);
-  { uint32_t x56 = cmovznz(x52, x39, x24);
-  { uint32_t x57 = cmovznz(x52, x36, x21);
+  { uint32_t x53 = cmovznz32(x52, x48, x33);
+  { uint32_t x54 = cmovznz32(x52, x45, x30);
+  { uint32_t x55 = cmovznz32(x52, x42, x27);
+  { uint32_t x56 = cmovznz32(x52, x39, x24);
+  { uint32_t x57 = cmovznz32(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery32_2e150m5/feaddDisplay.log b/src/Specific/montgomery32_2e150m5/feaddDisplay.log
index c0adb522e..28a86c45b 100644
--- a/src/Specific/montgomery32_2e150m5/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e150m5/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint32_t x45, uint8_t x46 = subborrow_u32(x43, x30, 0xffffffff);
  uint32_t x48, uint8_t x49 = subborrow_u32(x46, x33, 0x3fffff);
  uint32_t _, uint8_t x52 = subborrow_u32(x49, x34, 0x0);
- uint32_t x53 = cmovznz(x52, x48, x33);
- uint32_t x54 = cmovznz(x52, x45, x30);
- uint32_t x55 = cmovznz(x52, x42, x27);
- uint32_t x56 = cmovznz(x52, x39, x24);
- uint32_t x57 = cmovznz(x52, x36, x21);
+ uint32_t x53 = cmovznz32(x52, x48, x33);
+ uint32_t x54 = cmovznz32(x52, x45, x30);
+ uint32_t x55 = cmovznz32(x52, x42, x27);
+ uint32_t x56 = cmovznz32(x52, x39, x24);
+ uint32_t x57 = cmovznz32(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e150m5/femul.c b/src/Specific/montgomery32_2e150m5/femul.c
index 19902bde1..bf7026593 100644
--- a/src/Specific/montgomery32_2e150m5/femul.c
+++ b/src/Specific/montgomery32_2e150m5/femul.c
@@ -178,11 +178,11 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x511; uint8_t x512 = _subborrow_u32(x509, x495, 0xffffffff, &x511);
   { uint32_t x514; uint8_t x515 = _subborrow_u32(x512, x498, 0x3fffff, &x514);
   { uint32_t _; uint8_t x518 = _subborrow_u32(x515, x500, 0x0, &_);
-  { uint32_t x519 = cmovznz(x518, x514, x498);
-  { uint32_t x520 = cmovznz(x518, x511, x495);
-  { uint32_t x521 = cmovznz(x518, x508, x492);
-  { uint32_t x522 = cmovznz(x518, x505, x489);
-  { uint32_t x523 = cmovznz(x518, x502, x486);
+  { uint32_t x519 = cmovznz32(x518, x514, x498);
+  { uint32_t x520 = cmovznz32(x518, x511, x495);
+  { uint32_t x521 = cmovznz32(x518, x508, x492);
+  { uint32_t x522 = cmovznz32(x518, x505, x489);
+  { uint32_t x523 = cmovznz32(x518, x502, x486);
   out[0] = x523;
   out[1] = x522;
   out[2] = x521;
diff --git a/src/Specific/montgomery32_2e150m5/femulDisplay.log b/src/Specific/montgomery32_2e150m5/femulDisplay.log
index 7a8f06976..c78e55401 100644
--- a/src/Specific/montgomery32_2e150m5/femulDisplay.log
+++ b/src/Specific/montgomery32_2e150m5/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint32_t x511, uint8_t x512 = subborrow_u32(x509, x495, 0xffffffff);
  uint32_t x514, uint8_t x515 = subborrow_u32(x512, x498, 0x3fffff);
  uint32_t _, uint8_t x518 = subborrow_u32(x515, x500, 0x0);
- uint32_t x519 = cmovznz(x518, x514, x498);
- uint32_t x520 = cmovznz(x518, x511, x495);
- uint32_t x521 = cmovznz(x518, x508, x492);
- uint32_t x522 = cmovznz(x518, x505, x489);
- uint32_t x523 = cmovznz(x518, x502, x486);
+ uint32_t x519 = cmovznz32(x518, x514, x498);
+ uint32_t x520 = cmovznz32(x518, x511, x495);
+ uint32_t x521 = cmovznz32(x518, x508, x492);
+ uint32_t x522 = cmovznz32(x518, x505, x489);
+ uint32_t x523 = cmovznz32(x518, x502, x486);
  return (x519, x520, x521, x522, x523))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e150m5/feopp.c b/src/Specific/montgomery32_2e150m5/feopp.c
index 0484af931..a73292a9e 100644
--- a/src/Specific/montgomery32_2e150m5/feopp.c
+++ b/src/Specific/montgomery32_2e150m5/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16; uint8_t x17 = _subborrow_u32(x14, 0x0, x6, &x16);
   { uint32_t x19; uint8_t x20 = _subborrow_u32(x17, 0x0, x8, &x19);
   { uint32_t x22; uint8_t x23 = _subborrow_u32(x20, 0x0, x7, &x22);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0xfffffffb);
   { uint32_t x27; uint8_t x28 = _addcarryx_u32(0x0, x10, x25, &x27);
   { uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e150m5/feoppDisplay.log b/src/Specific/montgomery32_2e150m5/feoppDisplay.log
index 7d675c3dd..91f1653b3 100644
--- a/src/Specific/montgomery32_2e150m5/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e150m5/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = subborrow_u32(x14, 0x0, x6);
  uint32_t x19, uint8_t x20 = subborrow_u32(x17, 0x0, x8);
  uint32_t x22, uint8_t x23 = subborrow_u32(x20, 0x0, x7);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0xfffffffb);
  uint32_t x27, uint8_t x28 = addcarryx_u32(0x0, x10, x25);
  uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e150m5/fesub.c b/src/Specific/montgomery32_2e150m5/fesub.c
index f3fd6956d..7f860d2ba 100644
--- a/src/Specific/montgomery32_2e150m5/fesub.c
+++ b/src/Specific/montgomery32_2e150m5/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, x9, x17, &x27);
   { uint32_t x30; uint8_t x31 = _subborrow_u32(x28, x11, x19, &x30);
   { uint32_t x33; uint8_t x34 = _subborrow_u32(x31, x10, x18, &x33);
-  { uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+  { uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
   { uint32_t x36 = (x35 & 0xfffffffb);
   { uint32_t x38; uint8_t x39 = _addcarryx_u32(0x0, x21, x36, &x38);
   { uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e150m5/fesubDisplay.log b/src/Specific/montgomery32_2e150m5/fesubDisplay.log
index 9f21f1b4f..96fa1ea1d 100644
--- a/src/Specific/montgomery32_2e150m5/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e150m5/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, x9, x17);
  uint32_t x30, uint8_t x31 = subborrow_u32(x28, x11, x19);
  uint32_t x33, uint8_t x34 = subborrow_u32(x31, x10, x18);
- uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+ uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
  uint32_t x36 = (x35 & 0xfffffffb);
  uint32_t x38, uint8_t x39 = addcarryx_u32(0x0, x21, x36);
  uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e152m17/feadd.c b/src/Specific/montgomery32_2e152m17/feadd.c
index 3d9b9281a..7aa9a97e8 100644
--- a/src/Specific/montgomery32_2e152m17/feadd.c
+++ b/src/Specific/montgomery32_2e152m17/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x45; uint8_t x46 = _subborrow_u32(x43, x30, 0xffffffff, &x45);
   { uint32_t x48; uint8_t x49 = _subborrow_u32(x46, x33, 0xffffff, &x48);
   { uint32_t _; uint8_t x52 = _subborrow_u32(x49, x34, 0x0, &_);
-  { uint32_t x53 = cmovznz(x52, x48, x33);
-  { uint32_t x54 = cmovznz(x52, x45, x30);
-  { uint32_t x55 = cmovznz(x52, x42, x27);
-  { uint32_t x56 = cmovznz(x52, x39, x24);
-  { uint32_t x57 = cmovznz(x52, x36, x21);
+  { uint32_t x53 = cmovznz32(x52, x48, x33);
+  { uint32_t x54 = cmovznz32(x52, x45, x30);
+  { uint32_t x55 = cmovznz32(x52, x42, x27);
+  { uint32_t x56 = cmovznz32(x52, x39, x24);
+  { uint32_t x57 = cmovznz32(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery32_2e152m17/feaddDisplay.log b/src/Specific/montgomery32_2e152m17/feaddDisplay.log
index 9f96de209..f5e728c70 100644
--- a/src/Specific/montgomery32_2e152m17/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e152m17/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint32_t x45, uint8_t x46 = subborrow_u32(x43, x30, 0xffffffff);
  uint32_t x48, uint8_t x49 = subborrow_u32(x46, x33, 0xffffff);
  uint32_t _, uint8_t x52 = subborrow_u32(x49, x34, 0x0);
- uint32_t x53 = cmovznz(x52, x48, x33);
- uint32_t x54 = cmovznz(x52, x45, x30);
- uint32_t x55 = cmovznz(x52, x42, x27);
- uint32_t x56 = cmovznz(x52, x39, x24);
- uint32_t x57 = cmovznz(x52, x36, x21);
+ uint32_t x53 = cmovznz32(x52, x48, x33);
+ uint32_t x54 = cmovznz32(x52, x45, x30);
+ uint32_t x55 = cmovznz32(x52, x42, x27);
+ uint32_t x56 = cmovznz32(x52, x39, x24);
+ uint32_t x57 = cmovznz32(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e152m17/femul.c b/src/Specific/montgomery32_2e152m17/femul.c
index 2e18b2d18..b7f131ce6 100644
--- a/src/Specific/montgomery32_2e152m17/femul.c
+++ b/src/Specific/montgomery32_2e152m17/femul.c
@@ -178,11 +178,11 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x511; uint8_t x512 = _subborrow_u32(x509, x495, 0xffffffff, &x511);
   { uint32_t x514; uint8_t x515 = _subborrow_u32(x512, x498, 0xffffff, &x514);
   { uint32_t _; uint8_t x518 = _subborrow_u32(x515, x500, 0x0, &_);
-  { uint32_t x519 = cmovznz(x518, x514, x498);
-  { uint32_t x520 = cmovznz(x518, x511, x495);
-  { uint32_t x521 = cmovznz(x518, x508, x492);
-  { uint32_t x522 = cmovznz(x518, x505, x489);
-  { uint32_t x523 = cmovznz(x518, x502, x486);
+  { uint32_t x519 = cmovznz32(x518, x514, x498);
+  { uint32_t x520 = cmovznz32(x518, x511, x495);
+  { uint32_t x521 = cmovznz32(x518, x508, x492);
+  { uint32_t x522 = cmovznz32(x518, x505, x489);
+  { uint32_t x523 = cmovznz32(x518, x502, x486);
   out[0] = x523;
   out[1] = x522;
   out[2] = x521;
diff --git a/src/Specific/montgomery32_2e152m17/femulDisplay.log b/src/Specific/montgomery32_2e152m17/femulDisplay.log
index 4202f34ef..b6c0f4374 100644
--- a/src/Specific/montgomery32_2e152m17/femulDisplay.log
+++ b/src/Specific/montgomery32_2e152m17/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint32_t x511, uint8_t x512 = subborrow_u32(x509, x495, 0xffffffff);
  uint32_t x514, uint8_t x515 = subborrow_u32(x512, x498, 0xffffff);
  uint32_t _, uint8_t x518 = subborrow_u32(x515, x500, 0x0);
- uint32_t x519 = cmovznz(x518, x514, x498);
- uint32_t x520 = cmovznz(x518, x511, x495);
- uint32_t x521 = cmovznz(x518, x508, x492);
- uint32_t x522 = cmovznz(x518, x505, x489);
- uint32_t x523 = cmovznz(x518, x502, x486);
+ uint32_t x519 = cmovznz32(x518, x514, x498);
+ uint32_t x520 = cmovznz32(x518, x511, x495);
+ uint32_t x521 = cmovznz32(x518, x508, x492);
+ uint32_t x522 = cmovznz32(x518, x505, x489);
+ uint32_t x523 = cmovznz32(x518, x502, x486);
  return (x519, x520, x521, x522, x523))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e152m17/feopp.c b/src/Specific/montgomery32_2e152m17/feopp.c
index 3d25ee50b..9315b0eb2 100644
--- a/src/Specific/montgomery32_2e152m17/feopp.c
+++ b/src/Specific/montgomery32_2e152m17/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16; uint8_t x17 = _subborrow_u32(x14, 0x0, x6, &x16);
   { uint32_t x19; uint8_t x20 = _subborrow_u32(x17, 0x0, x8, &x19);
   { uint32_t x22; uint8_t x23 = _subborrow_u32(x20, 0x0, x7, &x22);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0xffffffef);
   { uint32_t x27; uint8_t x28 = _addcarryx_u32(0x0, x10, x25, &x27);
   { uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e152m17/feoppDisplay.log b/src/Specific/montgomery32_2e152m17/feoppDisplay.log
index 8e3715ec0..75f6eb65a 100644
--- a/src/Specific/montgomery32_2e152m17/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e152m17/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = subborrow_u32(x14, 0x0, x6);
  uint32_t x19, uint8_t x20 = subborrow_u32(x17, 0x0, x8);
  uint32_t x22, uint8_t x23 = subborrow_u32(x20, 0x0, x7);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0xffffffef);
  uint32_t x27, uint8_t x28 = addcarryx_u32(0x0, x10, x25);
  uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e152m17/fesub.c b/src/Specific/montgomery32_2e152m17/fesub.c
index f3c334379..613b712b5 100644
--- a/src/Specific/montgomery32_2e152m17/fesub.c
+++ b/src/Specific/montgomery32_2e152m17/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, x9, x17, &x27);
   { uint32_t x30; uint8_t x31 = _subborrow_u32(x28, x11, x19, &x30);
   { uint32_t x33; uint8_t x34 = _subborrow_u32(x31, x10, x18, &x33);
-  { uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+  { uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
   { uint32_t x36 = (x35 & 0xffffffef);
   { uint32_t x38; uint8_t x39 = _addcarryx_u32(0x0, x21, x36, &x38);
   { uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e152m17/fesubDisplay.log b/src/Specific/montgomery32_2e152m17/fesubDisplay.log
index 585c09ebc..ee2a25baf 100644
--- a/src/Specific/montgomery32_2e152m17/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e152m17/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, x9, x17);
  uint32_t x30, uint8_t x31 = subborrow_u32(x28, x11, x19);
  uint32_t x33, uint8_t x34 = subborrow_u32(x31, x10, x18);
- uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+ uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
  uint32_t x36 = (x35 & 0xffffffef);
  uint32_t x38, uint8_t x39 = addcarryx_u32(0x0, x21, x36);
  uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e158m15/feadd.c b/src/Specific/montgomery32_2e158m15/feadd.c
index 4830cea75..ea813d3c5 100644
--- a/src/Specific/montgomery32_2e158m15/feadd.c
+++ b/src/Specific/montgomery32_2e158m15/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x45; uint8_t x46 = _subborrow_u32(x43, x30, 0xffffffff, &x45);
   { uint32_t x48; uint8_t x49 = _subborrow_u32(x46, x33, 0x3fffffff, &x48);
   { uint32_t _; uint8_t x52 = _subborrow_u32(x49, x34, 0x0, &_);
-  { uint32_t x53 = cmovznz(x52, x48, x33);
-  { uint32_t x54 = cmovznz(x52, x45, x30);
-  { uint32_t x55 = cmovznz(x52, x42, x27);
-  { uint32_t x56 = cmovznz(x52, x39, x24);
-  { uint32_t x57 = cmovznz(x52, x36, x21);
+  { uint32_t x53 = cmovznz32(x52, x48, x33);
+  { uint32_t x54 = cmovznz32(x52, x45, x30);
+  { uint32_t x55 = cmovznz32(x52, x42, x27);
+  { uint32_t x56 = cmovznz32(x52, x39, x24);
+  { uint32_t x57 = cmovznz32(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery32_2e158m15/feaddDisplay.log b/src/Specific/montgomery32_2e158m15/feaddDisplay.log
index ef546d282..b65769f73 100644
--- a/src/Specific/montgomery32_2e158m15/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e158m15/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint32_t x45, uint8_t x46 = subborrow_u32(x43, x30, 0xffffffff);
  uint32_t x48, uint8_t x49 = subborrow_u32(x46, x33, 0x3fffffff);
  uint32_t _, uint8_t x52 = subborrow_u32(x49, x34, 0x0);
- uint32_t x53 = cmovznz(x52, x48, x33);
- uint32_t x54 = cmovznz(x52, x45, x30);
- uint32_t x55 = cmovznz(x52, x42, x27);
- uint32_t x56 = cmovznz(x52, x39, x24);
- uint32_t x57 = cmovznz(x52, x36, x21);
+ uint32_t x53 = cmovznz32(x52, x48, x33);
+ uint32_t x54 = cmovznz32(x52, x45, x30);
+ uint32_t x55 = cmovznz32(x52, x42, x27);
+ uint32_t x56 = cmovznz32(x52, x39, x24);
+ uint32_t x57 = cmovznz32(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e158m15/femul.c b/src/Specific/montgomery32_2e158m15/femul.c
index 546c32f36..c3a464980 100644
--- a/src/Specific/montgomery32_2e158m15/femul.c
+++ b/src/Specific/montgomery32_2e158m15/femul.c
@@ -178,11 +178,11 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x511; uint8_t x512 = _subborrow_u32(x509, x495, 0xffffffff, &x511);
   { uint32_t x514; uint8_t x515 = _subborrow_u32(x512, x498, 0x3fffffff, &x514);
   { uint32_t _; uint8_t x518 = _subborrow_u32(x515, x500, 0x0, &_);
-  { uint32_t x519 = cmovznz(x518, x514, x498);
-  { uint32_t x520 = cmovznz(x518, x511, x495);
-  { uint32_t x521 = cmovznz(x518, x508, x492);
-  { uint32_t x522 = cmovznz(x518, x505, x489);
-  { uint32_t x523 = cmovznz(x518, x502, x486);
+  { uint32_t x519 = cmovznz32(x518, x514, x498);
+  { uint32_t x520 = cmovznz32(x518, x511, x495);
+  { uint32_t x521 = cmovznz32(x518, x508, x492);
+  { uint32_t x522 = cmovznz32(x518, x505, x489);
+  { uint32_t x523 = cmovznz32(x518, x502, x486);
   out[0] = x523;
   out[1] = x522;
   out[2] = x521;
diff --git a/src/Specific/montgomery32_2e158m15/femulDisplay.log b/src/Specific/montgomery32_2e158m15/femulDisplay.log
index dc40f4871..f849fb9b8 100644
--- a/src/Specific/montgomery32_2e158m15/femulDisplay.log
+++ b/src/Specific/montgomery32_2e158m15/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint32_t x511, uint8_t x512 = subborrow_u32(x509, x495, 0xffffffff);
  uint32_t x514, uint8_t x515 = subborrow_u32(x512, x498, 0x3fffffff);
  uint32_t _, uint8_t x518 = subborrow_u32(x515, x500, 0x0);
- uint32_t x519 = cmovznz(x518, x514, x498);
- uint32_t x520 = cmovznz(x518, x511, x495);
- uint32_t x521 = cmovznz(x518, x508, x492);
- uint32_t x522 = cmovznz(x518, x505, x489);
- uint32_t x523 = cmovznz(x518, x502, x486);
+ uint32_t x519 = cmovznz32(x518, x514, x498);
+ uint32_t x520 = cmovznz32(x518, x511, x495);
+ uint32_t x521 = cmovznz32(x518, x508, x492);
+ uint32_t x522 = cmovznz32(x518, x505, x489);
+ uint32_t x523 = cmovznz32(x518, x502, x486);
  return (x519, x520, x521, x522, x523))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e158m15/feopp.c b/src/Specific/montgomery32_2e158m15/feopp.c
index a5f6375a9..3f4e5751a 100644
--- a/src/Specific/montgomery32_2e158m15/feopp.c
+++ b/src/Specific/montgomery32_2e158m15/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16; uint8_t x17 = _subborrow_u32(x14, 0x0, x6, &x16);
   { uint32_t x19; uint8_t x20 = _subborrow_u32(x17, 0x0, x8, &x19);
   { uint32_t x22; uint8_t x23 = _subborrow_u32(x20, 0x0, x7, &x22);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0xfffffff1);
   { uint32_t x27; uint8_t x28 = _addcarryx_u32(0x0, x10, x25, &x27);
   { uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e158m15/feoppDisplay.log b/src/Specific/montgomery32_2e158m15/feoppDisplay.log
index 7f141f212..2697f64f6 100644
--- a/src/Specific/montgomery32_2e158m15/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e158m15/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = subborrow_u32(x14, 0x0, x6);
  uint32_t x19, uint8_t x20 = subborrow_u32(x17, 0x0, x8);
  uint32_t x22, uint8_t x23 = subborrow_u32(x20, 0x0, x7);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0xfffffff1);
  uint32_t x27, uint8_t x28 = addcarryx_u32(0x0, x10, x25);
  uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e158m15/fesub.c b/src/Specific/montgomery32_2e158m15/fesub.c
index 1ae7ece71..454b73e85 100644
--- a/src/Specific/montgomery32_2e158m15/fesub.c
+++ b/src/Specific/montgomery32_2e158m15/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, x9, x17, &x27);
   { uint32_t x30; uint8_t x31 = _subborrow_u32(x28, x11, x19, &x30);
   { uint32_t x33; uint8_t x34 = _subborrow_u32(x31, x10, x18, &x33);
-  { uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+  { uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
   { uint32_t x36 = (x35 & 0xfffffff1);
   { uint32_t x38; uint8_t x39 = _addcarryx_u32(0x0, x21, x36, &x38);
   { uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e158m15/fesubDisplay.log b/src/Specific/montgomery32_2e158m15/fesubDisplay.log
index d08896140..feebc0497 100644
--- a/src/Specific/montgomery32_2e158m15/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e158m15/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, x9, x17);
  uint32_t x30, uint8_t x31 = subborrow_u32(x28, x11, x19);
  uint32_t x33, uint8_t x34 = subborrow_u32(x31, x10, x18);
- uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+ uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
  uint32_t x36 = (x35 & 0xfffffff1);
  uint32_t x38, uint8_t x39 = addcarryx_u32(0x0, x21, x36);
  uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e165m25/feadd.c b/src/Specific/montgomery32_2e165m25/feadd.c
index c7eaaa241..e05f2ca1b 100644
--- a/src/Specific/montgomery32_2e165m25/feadd.c
+++ b/src/Specific/montgomery32_2e165m25/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x55; uint8_t x56 = _subborrow_u32(x53, x37, 0xffffffff, &x55);
   { uint32_t x58; uint8_t x59 = _subborrow_u32(x56, x40, 0x1f, &x58);
   { uint32_t _; uint8_t x62 = _subborrow_u32(x59, x41, 0x0, &_);
-  { uint32_t x63 = cmovznz(x62, x58, x40);
-  { uint32_t x64 = cmovznz(x62, x55, x37);
-  { uint32_t x65 = cmovznz(x62, x52, x34);
-  { uint32_t x66 = cmovznz(x62, x49, x31);
-  { uint32_t x67 = cmovznz(x62, x46, x28);
-  { uint32_t x68 = cmovznz(x62, x43, x25);
+  { uint32_t x63 = cmovznz32(x62, x58, x40);
+  { uint32_t x64 = cmovznz32(x62, x55, x37);
+  { uint32_t x65 = cmovznz32(x62, x52, x34);
+  { uint32_t x66 = cmovznz32(x62, x49, x31);
+  { uint32_t x67 = cmovznz32(x62, x46, x28);
+  { uint32_t x68 = cmovznz32(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery32_2e165m25/feaddDisplay.log b/src/Specific/montgomery32_2e165m25/feaddDisplay.log
index 08b5e203e..2d8233e99 100644
--- a/src/Specific/montgomery32_2e165m25/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e165m25/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint32_t x55, uint8_t x56 = subborrow_u32(x53, x37, 0xffffffff);
  uint32_t x58, uint8_t x59 = subborrow_u32(x56, x40, 0x1f);
  uint32_t _, uint8_t x62 = subborrow_u32(x59, x41, 0x0);
- uint32_t x63 = cmovznz(x62, x58, x40);
- uint32_t x64 = cmovznz(x62, x55, x37);
- uint32_t x65 = cmovznz(x62, x52, x34);
- uint32_t x66 = cmovznz(x62, x49, x31);
- uint32_t x67 = cmovznz(x62, x46, x28);
- uint32_t x68 = cmovznz(x62, x43, x25);
+ uint32_t x63 = cmovznz32(x62, x58, x40);
+ uint32_t x64 = cmovznz32(x62, x55, x37);
+ uint32_t x65 = cmovznz32(x62, x52, x34);
+ uint32_t x66 = cmovznz32(x62, x49, x31);
+ uint32_t x67 = cmovznz32(x62, x46, x28);
+ uint32_t x68 = cmovznz32(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e165m25/femul.c b/src/Specific/montgomery32_2e165m25/femul.c
index 7aeda2e2f..42401356b 100644
--- a/src/Specific/montgomery32_2e165m25/femul.c
+++ b/src/Specific/montgomery32_2e165m25/femul.c
@@ -250,12 +250,12 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x711; uint8_t x712 = _subborrow_u32(x709, x692, 0xffffffff, &x711);
   { uint32_t x714; uint8_t x715 = _subborrow_u32(x712, x695, 0x1f, &x714);
   { uint32_t _; uint8_t x718 = _subborrow_u32(x715, x697, 0x0, &_);
-  { uint32_t x719 = cmovznz(x718, x714, x695);
-  { uint32_t x720 = cmovznz(x718, x711, x692);
-  { uint32_t x721 = cmovznz(x718, x708, x689);
-  { uint32_t x722 = cmovznz(x718, x705, x686);
-  { uint32_t x723 = cmovznz(x718, x702, x683);
-  { uint32_t x724 = cmovznz(x718, x699, x680);
+  { uint32_t x719 = cmovznz32(x718, x714, x695);
+  { uint32_t x720 = cmovznz32(x718, x711, x692);
+  { uint32_t x721 = cmovznz32(x718, x708, x689);
+  { uint32_t x722 = cmovznz32(x718, x705, x686);
+  { uint32_t x723 = cmovznz32(x718, x702, x683);
+  { uint32_t x724 = cmovznz32(x718, x699, x680);
   out[0] = x724;
   out[1] = x723;
   out[2] = x722;
diff --git a/src/Specific/montgomery32_2e165m25/femulDisplay.log b/src/Specific/montgomery32_2e165m25/femulDisplay.log
index b47d7d467..76e90e61d 100644
--- a/src/Specific/montgomery32_2e165m25/femulDisplay.log
+++ b/src/Specific/montgomery32_2e165m25/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint32_t x711, uint8_t x712 = subborrow_u32(x709, x692, 0xffffffff);
  uint32_t x714, uint8_t x715 = subborrow_u32(x712, x695, 0x1f);
  uint32_t _, uint8_t x718 = subborrow_u32(x715, x697, 0x0);
- uint32_t x719 = cmovznz(x718, x714, x695);
- uint32_t x720 = cmovznz(x718, x711, x692);
- uint32_t x721 = cmovznz(x718, x708, x689);
- uint32_t x722 = cmovznz(x718, x705, x686);
- uint32_t x723 = cmovznz(x718, x702, x683);
- uint32_t x724 = cmovznz(x718, x699, x680);
+ uint32_t x719 = cmovznz32(x718, x714, x695);
+ uint32_t x720 = cmovznz32(x718, x711, x692);
+ uint32_t x721 = cmovznz32(x718, x708, x689);
+ uint32_t x722 = cmovznz32(x718, x705, x686);
+ uint32_t x723 = cmovznz32(x718, x702, x683);
+ uint32_t x724 = cmovznz32(x718, x699, x680);
  return (x719, x720, x721, x722, x723, x724))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e165m25/feopp.c b/src/Specific/montgomery32_2e165m25/feopp.c
index c9aeeded1..e8e2767ae 100644
--- a/src/Specific/montgomery32_2e165m25/feopp.c
+++ b/src/Specific/montgomery32_2e165m25/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21; uint8_t x22 = _subborrow_u32(x19, 0x0, x8, &x21);
   { uint32_t x24; uint8_t x25 = _subborrow_u32(x22, 0x0, x10, &x24);
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, 0x0, x9, &x27);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xffffffe7);
   { uint32_t x32; uint8_t x33 = _addcarryx_u32(0x0, x12, x30, &x32);
   { uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e165m25/feoppDisplay.log b/src/Specific/montgomery32_2e165m25/feoppDisplay.log
index 51baa1f08..df49ff1ff 100644
--- a/src/Specific/montgomery32_2e165m25/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e165m25/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = subborrow_u32(x19, 0x0, x8);
  uint32_t x24, uint8_t x25 = subborrow_u32(x22, 0x0, x10);
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, 0x0, x9);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xffffffe7);
  uint32_t x32, uint8_t x33 = addcarryx_u32(0x0, x12, x30);
  uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e165m25/fesub.c b/src/Specific/montgomery32_2e165m25/fesub.c
index 1df4a8069..2f1872aba 100644
--- a/src/Specific/montgomery32_2e165m25/fesub.c
+++ b/src/Specific/montgomery32_2e165m25/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x34; uint8_t x35 = _subborrow_u32(x32, x11, x21, &x34);
   { uint32_t x37; uint8_t x38 = _subborrow_u32(x35, x13, x23, &x37);
   { uint32_t x40; uint8_t x41 = _subborrow_u32(x38, x12, x22, &x40);
-  { uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+  { uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
   { uint32_t x43 = (x42 & 0xffffffe7);
   { uint32_t x45; uint8_t x46 = _addcarryx_u32(0x0, x25, x43, &x45);
   { uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e165m25/fesubDisplay.log b/src/Specific/montgomery32_2e165m25/fesubDisplay.log
index 044ba3995..c64a7d5aa 100644
--- a/src/Specific/montgomery32_2e165m25/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e165m25/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x34, uint8_t x35 = subborrow_u32(x32, x11, x21);
  uint32_t x37, uint8_t x38 = subborrow_u32(x35, x13, x23);
  uint32_t x40, uint8_t x41 = subborrow_u32(x38, x12, x22);
- uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+ uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
  uint32_t x43 = (x42 & 0xffffffe7);
  uint32_t x45, uint8_t x46 = addcarryx_u32(0x0, x25, x43);
  uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e166m5/feadd.c b/src/Specific/montgomery32_2e166m5/feadd.c
index 2781fe1c1..cd706f5c5 100644
--- a/src/Specific/montgomery32_2e166m5/feadd.c
+++ b/src/Specific/montgomery32_2e166m5/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x55; uint8_t x56 = _subborrow_u32(x53, x37, 0xffffffff, &x55);
   { uint32_t x58; uint8_t x59 = _subborrow_u32(x56, x40, 0x3f, &x58);
   { uint32_t _; uint8_t x62 = _subborrow_u32(x59, x41, 0x0, &_);
-  { uint32_t x63 = cmovznz(x62, x58, x40);
-  { uint32_t x64 = cmovznz(x62, x55, x37);
-  { uint32_t x65 = cmovznz(x62, x52, x34);
-  { uint32_t x66 = cmovznz(x62, x49, x31);
-  { uint32_t x67 = cmovznz(x62, x46, x28);
-  { uint32_t x68 = cmovznz(x62, x43, x25);
+  { uint32_t x63 = cmovznz32(x62, x58, x40);
+  { uint32_t x64 = cmovznz32(x62, x55, x37);
+  { uint32_t x65 = cmovznz32(x62, x52, x34);
+  { uint32_t x66 = cmovznz32(x62, x49, x31);
+  { uint32_t x67 = cmovznz32(x62, x46, x28);
+  { uint32_t x68 = cmovznz32(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery32_2e166m5/feaddDisplay.log b/src/Specific/montgomery32_2e166m5/feaddDisplay.log
index 07f82418d..194e37fb2 100644
--- a/src/Specific/montgomery32_2e166m5/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e166m5/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint32_t x55, uint8_t x56 = subborrow_u32(x53, x37, 0xffffffff);
  uint32_t x58, uint8_t x59 = subborrow_u32(x56, x40, 0x3f);
  uint32_t _, uint8_t x62 = subborrow_u32(x59, x41, 0x0);
- uint32_t x63 = cmovznz(x62, x58, x40);
- uint32_t x64 = cmovznz(x62, x55, x37);
- uint32_t x65 = cmovznz(x62, x52, x34);
- uint32_t x66 = cmovznz(x62, x49, x31);
- uint32_t x67 = cmovznz(x62, x46, x28);
- uint32_t x68 = cmovznz(x62, x43, x25);
+ uint32_t x63 = cmovznz32(x62, x58, x40);
+ uint32_t x64 = cmovznz32(x62, x55, x37);
+ uint32_t x65 = cmovznz32(x62, x52, x34);
+ uint32_t x66 = cmovznz32(x62, x49, x31);
+ uint32_t x67 = cmovznz32(x62, x46, x28);
+ uint32_t x68 = cmovznz32(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e166m5/femul.c b/src/Specific/montgomery32_2e166m5/femul.c
index 0a7324b5b..b834472fd 100644
--- a/src/Specific/montgomery32_2e166m5/femul.c
+++ b/src/Specific/montgomery32_2e166m5/femul.c
@@ -250,12 +250,12 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x711; uint8_t x712 = _subborrow_u32(x709, x692, 0xffffffff, &x711);
   { uint32_t x714; uint8_t x715 = _subborrow_u32(x712, x695, 0x3f, &x714);
   { uint32_t _; uint8_t x718 = _subborrow_u32(x715, x697, 0x0, &_);
-  { uint32_t x719 = cmovznz(x718, x714, x695);
-  { uint32_t x720 = cmovznz(x718, x711, x692);
-  { uint32_t x721 = cmovznz(x718, x708, x689);
-  { uint32_t x722 = cmovznz(x718, x705, x686);
-  { uint32_t x723 = cmovznz(x718, x702, x683);
-  { uint32_t x724 = cmovznz(x718, x699, x680);
+  { uint32_t x719 = cmovznz32(x718, x714, x695);
+  { uint32_t x720 = cmovznz32(x718, x711, x692);
+  { uint32_t x721 = cmovznz32(x718, x708, x689);
+  { uint32_t x722 = cmovznz32(x718, x705, x686);
+  { uint32_t x723 = cmovznz32(x718, x702, x683);
+  { uint32_t x724 = cmovznz32(x718, x699, x680);
   out[0] = x724;
   out[1] = x723;
   out[2] = x722;
diff --git a/src/Specific/montgomery32_2e166m5/femulDisplay.log b/src/Specific/montgomery32_2e166m5/femulDisplay.log
index a26de0769..7202f403c 100644
--- a/src/Specific/montgomery32_2e166m5/femulDisplay.log
+++ b/src/Specific/montgomery32_2e166m5/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint32_t x711, uint8_t x712 = subborrow_u32(x709, x692, 0xffffffff);
  uint32_t x714, uint8_t x715 = subborrow_u32(x712, x695, 0x3f);
  uint32_t _, uint8_t x718 = subborrow_u32(x715, x697, 0x0);
- uint32_t x719 = cmovznz(x718, x714, x695);
- uint32_t x720 = cmovznz(x718, x711, x692);
- uint32_t x721 = cmovznz(x718, x708, x689);
- uint32_t x722 = cmovznz(x718, x705, x686);
- uint32_t x723 = cmovznz(x718, x702, x683);
- uint32_t x724 = cmovznz(x718, x699, x680);
+ uint32_t x719 = cmovznz32(x718, x714, x695);
+ uint32_t x720 = cmovznz32(x718, x711, x692);
+ uint32_t x721 = cmovznz32(x718, x708, x689);
+ uint32_t x722 = cmovznz32(x718, x705, x686);
+ uint32_t x723 = cmovznz32(x718, x702, x683);
+ uint32_t x724 = cmovznz32(x718, x699, x680);
  return (x719, x720, x721, x722, x723, x724))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e166m5/feopp.c b/src/Specific/montgomery32_2e166m5/feopp.c
index fcdca608c..d9caf7596 100644
--- a/src/Specific/montgomery32_2e166m5/feopp.c
+++ b/src/Specific/montgomery32_2e166m5/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21; uint8_t x22 = _subborrow_u32(x19, 0x0, x8, &x21);
   { uint32_t x24; uint8_t x25 = _subborrow_u32(x22, 0x0, x10, &x24);
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, 0x0, x9, &x27);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xfffffffb);
   { uint32_t x32; uint8_t x33 = _addcarryx_u32(0x0, x12, x30, &x32);
   { uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e166m5/feoppDisplay.log b/src/Specific/montgomery32_2e166m5/feoppDisplay.log
index a18d86d05..8b39a6b4e 100644
--- a/src/Specific/montgomery32_2e166m5/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e166m5/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = subborrow_u32(x19, 0x0, x8);
  uint32_t x24, uint8_t x25 = subborrow_u32(x22, 0x0, x10);
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, 0x0, x9);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xfffffffb);
  uint32_t x32, uint8_t x33 = addcarryx_u32(0x0, x12, x30);
  uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e166m5/fesub.c b/src/Specific/montgomery32_2e166m5/fesub.c
index dd8a1a19f..5ce4a0e74 100644
--- a/src/Specific/montgomery32_2e166m5/fesub.c
+++ b/src/Specific/montgomery32_2e166m5/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x34; uint8_t x35 = _subborrow_u32(x32, x11, x21, &x34);
   { uint32_t x37; uint8_t x38 = _subborrow_u32(x35, x13, x23, &x37);
   { uint32_t x40; uint8_t x41 = _subborrow_u32(x38, x12, x22, &x40);
-  { uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+  { uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
   { uint32_t x43 = (x42 & 0xfffffffb);
   { uint32_t x45; uint8_t x46 = _addcarryx_u32(0x0, x25, x43, &x45);
   { uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e166m5/fesubDisplay.log b/src/Specific/montgomery32_2e166m5/fesubDisplay.log
index ceada77e6..5b6f35fd1 100644
--- a/src/Specific/montgomery32_2e166m5/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e166m5/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x34, uint8_t x35 = subborrow_u32(x32, x11, x21);
  uint32_t x37, uint8_t x38 = subborrow_u32(x35, x13, x23);
  uint32_t x40, uint8_t x41 = subborrow_u32(x38, x12, x22);
- uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+ uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
  uint32_t x43 = (x42 & 0xfffffffb);
  uint32_t x45, uint8_t x46 = addcarryx_u32(0x0, x25, x43);
  uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e171m19/feadd.c b/src/Specific/montgomery32_2e171m19/feadd.c
index 6f51fc45e..85dcc582d 100644
--- a/src/Specific/montgomery32_2e171m19/feadd.c
+++ b/src/Specific/montgomery32_2e171m19/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x55; uint8_t x56 = _subborrow_u32(x53, x37, 0xffffffff, &x55);
   { uint32_t x58; uint8_t x59 = _subborrow_u32(x56, x40, 0x7ff, &x58);
   { uint32_t _; uint8_t x62 = _subborrow_u32(x59, x41, 0x0, &_);
-  { uint32_t x63 = cmovznz(x62, x58, x40);
-  { uint32_t x64 = cmovznz(x62, x55, x37);
-  { uint32_t x65 = cmovznz(x62, x52, x34);
-  { uint32_t x66 = cmovznz(x62, x49, x31);
-  { uint32_t x67 = cmovznz(x62, x46, x28);
-  { uint32_t x68 = cmovznz(x62, x43, x25);
+  { uint32_t x63 = cmovznz32(x62, x58, x40);
+  { uint32_t x64 = cmovznz32(x62, x55, x37);
+  { uint32_t x65 = cmovznz32(x62, x52, x34);
+  { uint32_t x66 = cmovznz32(x62, x49, x31);
+  { uint32_t x67 = cmovznz32(x62, x46, x28);
+  { uint32_t x68 = cmovznz32(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery32_2e171m19/feaddDisplay.log b/src/Specific/montgomery32_2e171m19/feaddDisplay.log
index 0021ca383..4a39a15c4 100644
--- a/src/Specific/montgomery32_2e171m19/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e171m19/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint32_t x55, uint8_t x56 = subborrow_u32(x53, x37, 0xffffffff);
  uint32_t x58, uint8_t x59 = subborrow_u32(x56, x40, 0x7ff);
  uint32_t _, uint8_t x62 = subborrow_u32(x59, x41, 0x0);
- uint32_t x63 = cmovznz(x62, x58, x40);
- uint32_t x64 = cmovznz(x62, x55, x37);
- uint32_t x65 = cmovznz(x62, x52, x34);
- uint32_t x66 = cmovznz(x62, x49, x31);
- uint32_t x67 = cmovznz(x62, x46, x28);
- uint32_t x68 = cmovznz(x62, x43, x25);
+ uint32_t x63 = cmovznz32(x62, x58, x40);
+ uint32_t x64 = cmovznz32(x62, x55, x37);
+ uint32_t x65 = cmovznz32(x62, x52, x34);
+ uint32_t x66 = cmovznz32(x62, x49, x31);
+ uint32_t x67 = cmovznz32(x62, x46, x28);
+ uint32_t x68 = cmovznz32(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e171m19/femul.c b/src/Specific/montgomery32_2e171m19/femul.c
index f1809e352..e41566974 100644
--- a/src/Specific/montgomery32_2e171m19/femul.c
+++ b/src/Specific/montgomery32_2e171m19/femul.c
@@ -250,12 +250,12 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x723; uint8_t x724 = _subborrow_u32(x721, x704, 0xffffffff, &x723);
   { uint32_t x726; uint8_t x727 = _subborrow_u32(x724, x707, 0x7ff, &x726);
   { uint32_t _; uint8_t x730 = _subborrow_u32(x727, x709, 0x0, &_);
-  { uint32_t x731 = cmovznz(x730, x726, x707);
-  { uint32_t x732 = cmovznz(x730, x723, x704);
-  { uint32_t x733 = cmovznz(x730, x720, x701);
-  { uint32_t x734 = cmovznz(x730, x717, x698);
-  { uint32_t x735 = cmovznz(x730, x714, x695);
-  { uint32_t x736 = cmovznz(x730, x711, x692);
+  { uint32_t x731 = cmovznz32(x730, x726, x707);
+  { uint32_t x732 = cmovznz32(x730, x723, x704);
+  { uint32_t x733 = cmovznz32(x730, x720, x701);
+  { uint32_t x734 = cmovznz32(x730, x717, x698);
+  { uint32_t x735 = cmovznz32(x730, x714, x695);
+  { uint32_t x736 = cmovznz32(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery32_2e171m19/femulDisplay.log b/src/Specific/montgomery32_2e171m19/femulDisplay.log
index f1599b69e..d4b873886 100644
--- a/src/Specific/montgomery32_2e171m19/femulDisplay.log
+++ b/src/Specific/montgomery32_2e171m19/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint32_t x723, uint8_t x724 = subborrow_u32(x721, x704, 0xffffffff);
  uint32_t x726, uint8_t x727 = subborrow_u32(x724, x707, 0x7ff);
  uint32_t _, uint8_t x730 = subborrow_u32(x727, x709, 0x0);
- uint32_t x731 = cmovznz(x730, x726, x707);
- uint32_t x732 = cmovznz(x730, x723, x704);
- uint32_t x733 = cmovznz(x730, x720, x701);
- uint32_t x734 = cmovznz(x730, x717, x698);
- uint32_t x735 = cmovznz(x730, x714, x695);
- uint32_t x736 = cmovznz(x730, x711, x692);
+ uint32_t x731 = cmovznz32(x730, x726, x707);
+ uint32_t x732 = cmovznz32(x730, x723, x704);
+ uint32_t x733 = cmovznz32(x730, x720, x701);
+ uint32_t x734 = cmovznz32(x730, x717, x698);
+ uint32_t x735 = cmovznz32(x730, x714, x695);
+ uint32_t x736 = cmovznz32(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e171m19/feopp.c b/src/Specific/montgomery32_2e171m19/feopp.c
index 90528287a..c7d34f427 100644
--- a/src/Specific/montgomery32_2e171m19/feopp.c
+++ b/src/Specific/montgomery32_2e171m19/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21; uint8_t x22 = _subborrow_u32(x19, 0x0, x8, &x21);
   { uint32_t x24; uint8_t x25 = _subborrow_u32(x22, 0x0, x10, &x24);
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, 0x0, x9, &x27);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xffffffed);
   { uint32_t x32; uint8_t x33 = _addcarryx_u32(0x0, x12, x30, &x32);
   { uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e171m19/feoppDisplay.log b/src/Specific/montgomery32_2e171m19/feoppDisplay.log
index fca976798..c49945ba8 100644
--- a/src/Specific/montgomery32_2e171m19/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e171m19/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = subborrow_u32(x19, 0x0, x8);
  uint32_t x24, uint8_t x25 = subborrow_u32(x22, 0x0, x10);
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, 0x0, x9);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xffffffed);
  uint32_t x32, uint8_t x33 = addcarryx_u32(0x0, x12, x30);
  uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e171m19/fesub.c b/src/Specific/montgomery32_2e171m19/fesub.c
index 6d10dffd7..7dc4f0d26 100644
--- a/src/Specific/montgomery32_2e171m19/fesub.c
+++ b/src/Specific/montgomery32_2e171m19/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x34; uint8_t x35 = _subborrow_u32(x32, x11, x21, &x34);
   { uint32_t x37; uint8_t x38 = _subborrow_u32(x35, x13, x23, &x37);
   { uint32_t x40; uint8_t x41 = _subborrow_u32(x38, x12, x22, &x40);
-  { uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+  { uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
   { uint32_t x43 = (x42 & 0xffffffed);
   { uint32_t x45; uint8_t x46 = _addcarryx_u32(0x0, x25, x43, &x45);
   { uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e171m19/fesubDisplay.log b/src/Specific/montgomery32_2e171m19/fesubDisplay.log
index fd768da88..4f3a0717b 100644
--- a/src/Specific/montgomery32_2e171m19/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e171m19/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x34, uint8_t x35 = subborrow_u32(x32, x11, x21);
  uint32_t x37, uint8_t x38 = subborrow_u32(x35, x13, x23);
  uint32_t x40, uint8_t x41 = subborrow_u32(x38, x12, x22);
- uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+ uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
  uint32_t x43 = (x42 & 0xffffffed);
  uint32_t x45, uint8_t x46 = addcarryx_u32(0x0, x25, x43);
  uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e174m17/feadd.c b/src/Specific/montgomery32_2e174m17/feadd.c
index 2c1967002..a361d09df 100644
--- a/src/Specific/montgomery32_2e174m17/feadd.c
+++ b/src/Specific/montgomery32_2e174m17/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x55; uint8_t x56 = _subborrow_u32(x53, x37, 0xffffffff, &x55);
   { uint32_t x58; uint8_t x59 = _subborrow_u32(x56, x40, 0x3fff, &x58);
   { uint32_t _; uint8_t x62 = _subborrow_u32(x59, x41, 0x0, &_);
-  { uint32_t x63 = cmovznz(x62, x58, x40);
-  { uint32_t x64 = cmovznz(x62, x55, x37);
-  { uint32_t x65 = cmovznz(x62, x52, x34);
-  { uint32_t x66 = cmovznz(x62, x49, x31);
-  { uint32_t x67 = cmovznz(x62, x46, x28);
-  { uint32_t x68 = cmovznz(x62, x43, x25);
+  { uint32_t x63 = cmovznz32(x62, x58, x40);
+  { uint32_t x64 = cmovznz32(x62, x55, x37);
+  { uint32_t x65 = cmovznz32(x62, x52, x34);
+  { uint32_t x66 = cmovznz32(x62, x49, x31);
+  { uint32_t x67 = cmovznz32(x62, x46, x28);
+  { uint32_t x68 = cmovznz32(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery32_2e174m17/feaddDisplay.log b/src/Specific/montgomery32_2e174m17/feaddDisplay.log
index de742aef3..31e22218b 100644
--- a/src/Specific/montgomery32_2e174m17/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e174m17/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint32_t x55, uint8_t x56 = subborrow_u32(x53, x37, 0xffffffff);
  uint32_t x58, uint8_t x59 = subborrow_u32(x56, x40, 0x3fff);
  uint32_t _, uint8_t x62 = subborrow_u32(x59, x41, 0x0);
- uint32_t x63 = cmovznz(x62, x58, x40);
- uint32_t x64 = cmovznz(x62, x55, x37);
- uint32_t x65 = cmovznz(x62, x52, x34);
- uint32_t x66 = cmovznz(x62, x49, x31);
- uint32_t x67 = cmovznz(x62, x46, x28);
- uint32_t x68 = cmovznz(x62, x43, x25);
+ uint32_t x63 = cmovznz32(x62, x58, x40);
+ uint32_t x64 = cmovznz32(x62, x55, x37);
+ uint32_t x65 = cmovznz32(x62, x52, x34);
+ uint32_t x66 = cmovznz32(x62, x49, x31);
+ uint32_t x67 = cmovznz32(x62, x46, x28);
+ uint32_t x68 = cmovznz32(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e174m17/femul.c b/src/Specific/montgomery32_2e174m17/femul.c
index e713bda8f..b24bb3ee2 100644
--- a/src/Specific/montgomery32_2e174m17/femul.c
+++ b/src/Specific/montgomery32_2e174m17/femul.c
@@ -250,12 +250,12 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x723; uint8_t x724 = _subborrow_u32(x721, x704, 0xffffffff, &x723);
   { uint32_t x726; uint8_t x727 = _subborrow_u32(x724, x707, 0x3fff, &x726);
   { uint32_t _; uint8_t x730 = _subborrow_u32(x727, x709, 0x0, &_);
-  { uint32_t x731 = cmovznz(x730, x726, x707);
-  { uint32_t x732 = cmovznz(x730, x723, x704);
-  { uint32_t x733 = cmovznz(x730, x720, x701);
-  { uint32_t x734 = cmovznz(x730, x717, x698);
-  { uint32_t x735 = cmovznz(x730, x714, x695);
-  { uint32_t x736 = cmovznz(x730, x711, x692);
+  { uint32_t x731 = cmovznz32(x730, x726, x707);
+  { uint32_t x732 = cmovznz32(x730, x723, x704);
+  { uint32_t x733 = cmovznz32(x730, x720, x701);
+  { uint32_t x734 = cmovznz32(x730, x717, x698);
+  { uint32_t x735 = cmovznz32(x730, x714, x695);
+  { uint32_t x736 = cmovznz32(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery32_2e174m17/femulDisplay.log b/src/Specific/montgomery32_2e174m17/femulDisplay.log
index 90a669291..047054f7e 100644
--- a/src/Specific/montgomery32_2e174m17/femulDisplay.log
+++ b/src/Specific/montgomery32_2e174m17/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint32_t x723, uint8_t x724 = subborrow_u32(x721, x704, 0xffffffff);
  uint32_t x726, uint8_t x727 = subborrow_u32(x724, x707, 0x3fff);
  uint32_t _, uint8_t x730 = subborrow_u32(x727, x709, 0x0);
- uint32_t x731 = cmovznz(x730, x726, x707);
- uint32_t x732 = cmovznz(x730, x723, x704);
- uint32_t x733 = cmovznz(x730, x720, x701);
- uint32_t x734 = cmovznz(x730, x717, x698);
- uint32_t x735 = cmovznz(x730, x714, x695);
- uint32_t x736 = cmovznz(x730, x711, x692);
+ uint32_t x731 = cmovznz32(x730, x726, x707);
+ uint32_t x732 = cmovznz32(x730, x723, x704);
+ uint32_t x733 = cmovznz32(x730, x720, x701);
+ uint32_t x734 = cmovznz32(x730, x717, x698);
+ uint32_t x735 = cmovznz32(x730, x714, x695);
+ uint32_t x736 = cmovznz32(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e174m17/feopp.c b/src/Specific/montgomery32_2e174m17/feopp.c
index c4e407fe1..65336f912 100644
--- a/src/Specific/montgomery32_2e174m17/feopp.c
+++ b/src/Specific/montgomery32_2e174m17/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21; uint8_t x22 = _subborrow_u32(x19, 0x0, x8, &x21);
   { uint32_t x24; uint8_t x25 = _subborrow_u32(x22, 0x0, x10, &x24);
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, 0x0, x9, &x27);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xffffffef);
   { uint32_t x32; uint8_t x33 = _addcarryx_u32(0x0, x12, x30, &x32);
   { uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e174m17/feoppDisplay.log b/src/Specific/montgomery32_2e174m17/feoppDisplay.log
index c52675634..189315f28 100644
--- a/src/Specific/montgomery32_2e174m17/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e174m17/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = subborrow_u32(x19, 0x0, x8);
  uint32_t x24, uint8_t x25 = subborrow_u32(x22, 0x0, x10);
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, 0x0, x9);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xffffffef);
  uint32_t x32, uint8_t x33 = addcarryx_u32(0x0, x12, x30);
  uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e174m17/fesub.c b/src/Specific/montgomery32_2e174m17/fesub.c
index 0e395b59f..e66d18339 100644
--- a/src/Specific/montgomery32_2e174m17/fesub.c
+++ b/src/Specific/montgomery32_2e174m17/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x34; uint8_t x35 = _subborrow_u32(x32, x11, x21, &x34);
   { uint32_t x37; uint8_t x38 = _subborrow_u32(x35, x13, x23, &x37);
   { uint32_t x40; uint8_t x41 = _subborrow_u32(x38, x12, x22, &x40);
-  { uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+  { uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
   { uint32_t x43 = (x42 & 0xffffffef);
   { uint32_t x45; uint8_t x46 = _addcarryx_u32(0x0, x25, x43, &x45);
   { uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e174m17/fesubDisplay.log b/src/Specific/montgomery32_2e174m17/fesubDisplay.log
index 8d11cefbd..d5763203a 100644
--- a/src/Specific/montgomery32_2e174m17/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e174m17/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x34, uint8_t x35 = subborrow_u32(x32, x11, x21);
  uint32_t x37, uint8_t x38 = subborrow_u32(x35, x13, x23);
  uint32_t x40, uint8_t x41 = subborrow_u32(x38, x12, x22);
- uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+ uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
  uint32_t x43 = (x42 & 0xffffffef);
  uint32_t x45, uint8_t x46 = addcarryx_u32(0x0, x25, x43);
  uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e174m3/feadd.c b/src/Specific/montgomery32_2e174m3/feadd.c
index d0c417ed7..e6f12dcab 100644
--- a/src/Specific/montgomery32_2e174m3/feadd.c
+++ b/src/Specific/montgomery32_2e174m3/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x55; uint8_t x56 = _subborrow_u32(x53, x37, 0xffffffff, &x55);
   { uint32_t x58; uint8_t x59 = _subborrow_u32(x56, x40, 0x3fff, &x58);
   { uint32_t _; uint8_t x62 = _subborrow_u32(x59, x41, 0x0, &_);
-  { uint32_t x63 = cmovznz(x62, x58, x40);
-  { uint32_t x64 = cmovznz(x62, x55, x37);
-  { uint32_t x65 = cmovznz(x62, x52, x34);
-  { uint32_t x66 = cmovznz(x62, x49, x31);
-  { uint32_t x67 = cmovznz(x62, x46, x28);
-  { uint32_t x68 = cmovznz(x62, x43, x25);
+  { uint32_t x63 = cmovznz32(x62, x58, x40);
+  { uint32_t x64 = cmovznz32(x62, x55, x37);
+  { uint32_t x65 = cmovznz32(x62, x52, x34);
+  { uint32_t x66 = cmovznz32(x62, x49, x31);
+  { uint32_t x67 = cmovznz32(x62, x46, x28);
+  { uint32_t x68 = cmovznz32(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery32_2e174m3/feaddDisplay.log b/src/Specific/montgomery32_2e174m3/feaddDisplay.log
index 8de9e7769..e0691d08d 100644
--- a/src/Specific/montgomery32_2e174m3/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e174m3/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint32_t x55, uint8_t x56 = subborrow_u32(x53, x37, 0xffffffff);
  uint32_t x58, uint8_t x59 = subborrow_u32(x56, x40, 0x3fff);
  uint32_t _, uint8_t x62 = subborrow_u32(x59, x41, 0x0);
- uint32_t x63 = cmovznz(x62, x58, x40);
- uint32_t x64 = cmovznz(x62, x55, x37);
- uint32_t x65 = cmovznz(x62, x52, x34);
- uint32_t x66 = cmovznz(x62, x49, x31);
- uint32_t x67 = cmovznz(x62, x46, x28);
- uint32_t x68 = cmovznz(x62, x43, x25);
+ uint32_t x63 = cmovznz32(x62, x58, x40);
+ uint32_t x64 = cmovznz32(x62, x55, x37);
+ uint32_t x65 = cmovznz32(x62, x52, x34);
+ uint32_t x66 = cmovznz32(x62, x49, x31);
+ uint32_t x67 = cmovznz32(x62, x46, x28);
+ uint32_t x68 = cmovznz32(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e174m3/femul.c b/src/Specific/montgomery32_2e174m3/femul.c
index 4f0a64e4e..62d0623a2 100644
--- a/src/Specific/montgomery32_2e174m3/femul.c
+++ b/src/Specific/montgomery32_2e174m3/femul.c
@@ -250,12 +250,12 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x723; uint8_t x724 = _subborrow_u32(x721, x704, 0xffffffff, &x723);
   { uint32_t x726; uint8_t x727 = _subborrow_u32(x724, x707, 0x3fff, &x726);
   { uint32_t _; uint8_t x730 = _subborrow_u32(x727, x709, 0x0, &_);
-  { uint32_t x731 = cmovznz(x730, x726, x707);
-  { uint32_t x732 = cmovznz(x730, x723, x704);
-  { uint32_t x733 = cmovznz(x730, x720, x701);
-  { uint32_t x734 = cmovznz(x730, x717, x698);
-  { uint32_t x735 = cmovznz(x730, x714, x695);
-  { uint32_t x736 = cmovznz(x730, x711, x692);
+  { uint32_t x731 = cmovznz32(x730, x726, x707);
+  { uint32_t x732 = cmovznz32(x730, x723, x704);
+  { uint32_t x733 = cmovznz32(x730, x720, x701);
+  { uint32_t x734 = cmovznz32(x730, x717, x698);
+  { uint32_t x735 = cmovznz32(x730, x714, x695);
+  { uint32_t x736 = cmovznz32(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery32_2e174m3/femulDisplay.log b/src/Specific/montgomery32_2e174m3/femulDisplay.log
index aaa5a4abd..bc626a982 100644
--- a/src/Specific/montgomery32_2e174m3/femulDisplay.log
+++ b/src/Specific/montgomery32_2e174m3/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint32_t x723, uint8_t x724 = subborrow_u32(x721, x704, 0xffffffff);
  uint32_t x726, uint8_t x727 = subborrow_u32(x724, x707, 0x3fff);
  uint32_t _, uint8_t x730 = subborrow_u32(x727, x709, 0x0);
- uint32_t x731 = cmovznz(x730, x726, x707);
- uint32_t x732 = cmovznz(x730, x723, x704);
- uint32_t x733 = cmovznz(x730, x720, x701);
- uint32_t x734 = cmovznz(x730, x717, x698);
- uint32_t x735 = cmovznz(x730, x714, x695);
- uint32_t x736 = cmovznz(x730, x711, x692);
+ uint32_t x731 = cmovznz32(x730, x726, x707);
+ uint32_t x732 = cmovznz32(x730, x723, x704);
+ uint32_t x733 = cmovznz32(x730, x720, x701);
+ uint32_t x734 = cmovznz32(x730, x717, x698);
+ uint32_t x735 = cmovznz32(x730, x714, x695);
+ uint32_t x736 = cmovznz32(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e174m3/feopp.c b/src/Specific/montgomery32_2e174m3/feopp.c
index d8146fb04..f163e0729 100644
--- a/src/Specific/montgomery32_2e174m3/feopp.c
+++ b/src/Specific/montgomery32_2e174m3/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21; uint8_t x22 = _subborrow_u32(x19, 0x0, x8, &x21);
   { uint32_t x24; uint8_t x25 = _subborrow_u32(x22, 0x0, x10, &x24);
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, 0x0, x9, &x27);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xfffffffd);
   { uint32_t x32; uint8_t x33 = _addcarryx_u32(0x0, x12, x30, &x32);
   { uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e174m3/feoppDisplay.log b/src/Specific/montgomery32_2e174m3/feoppDisplay.log
index dac941777..1f234f789 100644
--- a/src/Specific/montgomery32_2e174m3/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e174m3/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = subborrow_u32(x19, 0x0, x8);
  uint32_t x24, uint8_t x25 = subborrow_u32(x22, 0x0, x10);
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, 0x0, x9);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xfffffffd);
  uint32_t x32, uint8_t x33 = addcarryx_u32(0x0, x12, x30);
  uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e174m3/fesub.c b/src/Specific/montgomery32_2e174m3/fesub.c
index 560115eb6..01db95d89 100644
--- a/src/Specific/montgomery32_2e174m3/fesub.c
+++ b/src/Specific/montgomery32_2e174m3/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x34; uint8_t x35 = _subborrow_u32(x32, x11, x21, &x34);
   { uint32_t x37; uint8_t x38 = _subborrow_u32(x35, x13, x23, &x37);
   { uint32_t x40; uint8_t x41 = _subborrow_u32(x38, x12, x22, &x40);
-  { uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+  { uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
   { uint32_t x43 = (x42 & 0xfffffffd);
   { uint32_t x45; uint8_t x46 = _addcarryx_u32(0x0, x25, x43, &x45);
   { uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e174m3/fesubDisplay.log b/src/Specific/montgomery32_2e174m3/fesubDisplay.log
index b8e55d397..7efb22e98 100644
--- a/src/Specific/montgomery32_2e174m3/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e174m3/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x34, uint8_t x35 = subborrow_u32(x32, x11, x21);
  uint32_t x37, uint8_t x38 = subborrow_u32(x35, x13, x23);
  uint32_t x40, uint8_t x41 = subborrow_u32(x38, x12, x22);
- uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+ uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
  uint32_t x43 = (x42 & 0xfffffffd);
  uint32_t x45, uint8_t x46 = addcarryx_u32(0x0, x25, x43);
  uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e189m25/feadd.c b/src/Specific/montgomery32_2e189m25/feadd.c
index e8ad28bbe..7bc1da67f 100644
--- a/src/Specific/montgomery32_2e189m25/feadd.c
+++ b/src/Specific/montgomery32_2e189m25/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x55; uint8_t x56 = _subborrow_u32(x53, x37, 0xffffffff, &x55);
   { uint32_t x58; uint8_t x59 = _subborrow_u32(x56, x40, 0x1fffffff, &x58);
   { uint32_t _; uint8_t x62 = _subborrow_u32(x59, x41, 0x0, &_);
-  { uint32_t x63 = cmovznz(x62, x58, x40);
-  { uint32_t x64 = cmovznz(x62, x55, x37);
-  { uint32_t x65 = cmovznz(x62, x52, x34);
-  { uint32_t x66 = cmovznz(x62, x49, x31);
-  { uint32_t x67 = cmovznz(x62, x46, x28);
-  { uint32_t x68 = cmovznz(x62, x43, x25);
+  { uint32_t x63 = cmovznz32(x62, x58, x40);
+  { uint32_t x64 = cmovznz32(x62, x55, x37);
+  { uint32_t x65 = cmovznz32(x62, x52, x34);
+  { uint32_t x66 = cmovznz32(x62, x49, x31);
+  { uint32_t x67 = cmovznz32(x62, x46, x28);
+  { uint32_t x68 = cmovznz32(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery32_2e189m25/feaddDisplay.log b/src/Specific/montgomery32_2e189m25/feaddDisplay.log
index 637759d19..4a1bcdf23 100644
--- a/src/Specific/montgomery32_2e189m25/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e189m25/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint32_t x55, uint8_t x56 = subborrow_u32(x53, x37, 0xffffffff);
  uint32_t x58, uint8_t x59 = subborrow_u32(x56, x40, 0x1fffffff);
  uint32_t _, uint8_t x62 = subborrow_u32(x59, x41, 0x0);
- uint32_t x63 = cmovznz(x62, x58, x40);
- uint32_t x64 = cmovznz(x62, x55, x37);
- uint32_t x65 = cmovznz(x62, x52, x34);
- uint32_t x66 = cmovznz(x62, x49, x31);
- uint32_t x67 = cmovznz(x62, x46, x28);
- uint32_t x68 = cmovznz(x62, x43, x25);
+ uint32_t x63 = cmovznz32(x62, x58, x40);
+ uint32_t x64 = cmovznz32(x62, x55, x37);
+ uint32_t x65 = cmovznz32(x62, x52, x34);
+ uint32_t x66 = cmovznz32(x62, x49, x31);
+ uint32_t x67 = cmovznz32(x62, x46, x28);
+ uint32_t x68 = cmovznz32(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e189m25/femul.c b/src/Specific/montgomery32_2e189m25/femul.c
index 416fe47bd..bca4a73ab 100644
--- a/src/Specific/montgomery32_2e189m25/femul.c
+++ b/src/Specific/montgomery32_2e189m25/femul.c
@@ -250,12 +250,12 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x723; uint8_t x724 = _subborrow_u32(x721, x704, 0xffffffff, &x723);
   { uint32_t x726; uint8_t x727 = _subborrow_u32(x724, x707, 0x1fffffff, &x726);
   { uint32_t _; uint8_t x730 = _subborrow_u32(x727, x709, 0x0, &_);
-  { uint32_t x731 = cmovznz(x730, x726, x707);
-  { uint32_t x732 = cmovznz(x730, x723, x704);
-  { uint32_t x733 = cmovznz(x730, x720, x701);
-  { uint32_t x734 = cmovznz(x730, x717, x698);
-  { uint32_t x735 = cmovznz(x730, x714, x695);
-  { uint32_t x736 = cmovznz(x730, x711, x692);
+  { uint32_t x731 = cmovznz32(x730, x726, x707);
+  { uint32_t x732 = cmovznz32(x730, x723, x704);
+  { uint32_t x733 = cmovznz32(x730, x720, x701);
+  { uint32_t x734 = cmovznz32(x730, x717, x698);
+  { uint32_t x735 = cmovznz32(x730, x714, x695);
+  { uint32_t x736 = cmovznz32(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery32_2e189m25/femulDisplay.log b/src/Specific/montgomery32_2e189m25/femulDisplay.log
index 4ac08278c..b5219a8ff 100644
--- a/src/Specific/montgomery32_2e189m25/femulDisplay.log
+++ b/src/Specific/montgomery32_2e189m25/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint32_t x723, uint8_t x724 = subborrow_u32(x721, x704, 0xffffffff);
  uint32_t x726, uint8_t x727 = subborrow_u32(x724, x707, 0x1fffffff);
  uint32_t _, uint8_t x730 = subborrow_u32(x727, x709, 0x0);
- uint32_t x731 = cmovznz(x730, x726, x707);
- uint32_t x732 = cmovznz(x730, x723, x704);
- uint32_t x733 = cmovznz(x730, x720, x701);
- uint32_t x734 = cmovznz(x730, x717, x698);
- uint32_t x735 = cmovznz(x730, x714, x695);
- uint32_t x736 = cmovznz(x730, x711, x692);
+ uint32_t x731 = cmovznz32(x730, x726, x707);
+ uint32_t x732 = cmovznz32(x730, x723, x704);
+ uint32_t x733 = cmovznz32(x730, x720, x701);
+ uint32_t x734 = cmovznz32(x730, x717, x698);
+ uint32_t x735 = cmovznz32(x730, x714, x695);
+ uint32_t x736 = cmovznz32(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e189m25/feopp.c b/src/Specific/montgomery32_2e189m25/feopp.c
index 70b81e9b8..53268a96c 100644
--- a/src/Specific/montgomery32_2e189m25/feopp.c
+++ b/src/Specific/montgomery32_2e189m25/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21; uint8_t x22 = _subborrow_u32(x19, 0x0, x8, &x21);
   { uint32_t x24; uint8_t x25 = _subborrow_u32(x22, 0x0, x10, &x24);
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, 0x0, x9, &x27);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xffffffe7);
   { uint32_t x32; uint8_t x33 = _addcarryx_u32(0x0, x12, x30, &x32);
   { uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e189m25/feoppDisplay.log b/src/Specific/montgomery32_2e189m25/feoppDisplay.log
index e0d4786c5..619df7d75 100644
--- a/src/Specific/montgomery32_2e189m25/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e189m25/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = subborrow_u32(x19, 0x0, x8);
  uint32_t x24, uint8_t x25 = subborrow_u32(x22, 0x0, x10);
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, 0x0, x9);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xffffffe7);
  uint32_t x32, uint8_t x33 = addcarryx_u32(0x0, x12, x30);
  uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e189m25/fesub.c b/src/Specific/montgomery32_2e189m25/fesub.c
index 3b721c799..6dcd995c0 100644
--- a/src/Specific/montgomery32_2e189m25/fesub.c
+++ b/src/Specific/montgomery32_2e189m25/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x34; uint8_t x35 = _subborrow_u32(x32, x11, x21, &x34);
   { uint32_t x37; uint8_t x38 = _subborrow_u32(x35, x13, x23, &x37);
   { uint32_t x40; uint8_t x41 = _subborrow_u32(x38, x12, x22, &x40);
-  { uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+  { uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
   { uint32_t x43 = (x42 & 0xffffffe7);
   { uint32_t x45; uint8_t x46 = _addcarryx_u32(0x0, x25, x43, &x45);
   { uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e189m25/fesubDisplay.log b/src/Specific/montgomery32_2e189m25/fesubDisplay.log
index 968735763..2e7956b02 100644
--- a/src/Specific/montgomery32_2e189m25/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e189m25/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x34, uint8_t x35 = subborrow_u32(x32, x11, x21);
  uint32_t x37, uint8_t x38 = subborrow_u32(x35, x13, x23);
  uint32_t x40, uint8_t x41 = subborrow_u32(x38, x12, x22);
- uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+ uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
  uint32_t x43 = (x42 & 0xffffffe7);
  uint32_t x45, uint8_t x46 = addcarryx_u32(0x0, x25, x43);
  uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e190m11/feadd.c b/src/Specific/montgomery32_2e190m11/feadd.c
index 95eaecbb3..411144107 100644
--- a/src/Specific/montgomery32_2e190m11/feadd.c
+++ b/src/Specific/montgomery32_2e190m11/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x55; uint8_t x56 = _subborrow_u32(x53, x37, 0xffffffff, &x55);
   { uint32_t x58; uint8_t x59 = _subborrow_u32(x56, x40, 0x3fffffff, &x58);
   { uint32_t _; uint8_t x62 = _subborrow_u32(x59, x41, 0x0, &_);
-  { uint32_t x63 = cmovznz(x62, x58, x40);
-  { uint32_t x64 = cmovznz(x62, x55, x37);
-  { uint32_t x65 = cmovznz(x62, x52, x34);
-  { uint32_t x66 = cmovznz(x62, x49, x31);
-  { uint32_t x67 = cmovznz(x62, x46, x28);
-  { uint32_t x68 = cmovznz(x62, x43, x25);
+  { uint32_t x63 = cmovznz32(x62, x58, x40);
+  { uint32_t x64 = cmovznz32(x62, x55, x37);
+  { uint32_t x65 = cmovznz32(x62, x52, x34);
+  { uint32_t x66 = cmovznz32(x62, x49, x31);
+  { uint32_t x67 = cmovznz32(x62, x46, x28);
+  { uint32_t x68 = cmovznz32(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery32_2e190m11/feaddDisplay.log b/src/Specific/montgomery32_2e190m11/feaddDisplay.log
index 40ea53d7b..3b885fe29 100644
--- a/src/Specific/montgomery32_2e190m11/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e190m11/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint32_t x55, uint8_t x56 = subborrow_u32(x53, x37, 0xffffffff);
  uint32_t x58, uint8_t x59 = subborrow_u32(x56, x40, 0x3fffffff);
  uint32_t _, uint8_t x62 = subborrow_u32(x59, x41, 0x0);
- uint32_t x63 = cmovznz(x62, x58, x40);
- uint32_t x64 = cmovznz(x62, x55, x37);
- uint32_t x65 = cmovznz(x62, x52, x34);
- uint32_t x66 = cmovznz(x62, x49, x31);
- uint32_t x67 = cmovznz(x62, x46, x28);
- uint32_t x68 = cmovznz(x62, x43, x25);
+ uint32_t x63 = cmovznz32(x62, x58, x40);
+ uint32_t x64 = cmovznz32(x62, x55, x37);
+ uint32_t x65 = cmovznz32(x62, x52, x34);
+ uint32_t x66 = cmovznz32(x62, x49, x31);
+ uint32_t x67 = cmovznz32(x62, x46, x28);
+ uint32_t x68 = cmovznz32(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e190m11/femul.c b/src/Specific/montgomery32_2e190m11/femul.c
index 456c753e9..b62e2cb3c 100644
--- a/src/Specific/montgomery32_2e190m11/femul.c
+++ b/src/Specific/montgomery32_2e190m11/femul.c
@@ -250,12 +250,12 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x723; uint8_t x724 = _subborrow_u32(x721, x704, 0xffffffff, &x723);
   { uint32_t x726; uint8_t x727 = _subborrow_u32(x724, x707, 0x3fffffff, &x726);
   { uint32_t _; uint8_t x730 = _subborrow_u32(x727, x709, 0x0, &_);
-  { uint32_t x731 = cmovznz(x730, x726, x707);
-  { uint32_t x732 = cmovznz(x730, x723, x704);
-  { uint32_t x733 = cmovznz(x730, x720, x701);
-  { uint32_t x734 = cmovznz(x730, x717, x698);
-  { uint32_t x735 = cmovznz(x730, x714, x695);
-  { uint32_t x736 = cmovznz(x730, x711, x692);
+  { uint32_t x731 = cmovznz32(x730, x726, x707);
+  { uint32_t x732 = cmovznz32(x730, x723, x704);
+  { uint32_t x733 = cmovznz32(x730, x720, x701);
+  { uint32_t x734 = cmovznz32(x730, x717, x698);
+  { uint32_t x735 = cmovznz32(x730, x714, x695);
+  { uint32_t x736 = cmovznz32(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery32_2e190m11/femulDisplay.log b/src/Specific/montgomery32_2e190m11/femulDisplay.log
index 93091322b..c302cbb1d 100644
--- a/src/Specific/montgomery32_2e190m11/femulDisplay.log
+++ b/src/Specific/montgomery32_2e190m11/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint32_t x723, uint8_t x724 = subborrow_u32(x721, x704, 0xffffffff);
  uint32_t x726, uint8_t x727 = subborrow_u32(x724, x707, 0x3fffffff);
  uint32_t _, uint8_t x730 = subborrow_u32(x727, x709, 0x0);
- uint32_t x731 = cmovznz(x730, x726, x707);
- uint32_t x732 = cmovznz(x730, x723, x704);
- uint32_t x733 = cmovznz(x730, x720, x701);
- uint32_t x734 = cmovznz(x730, x717, x698);
- uint32_t x735 = cmovznz(x730, x714, x695);
- uint32_t x736 = cmovznz(x730, x711, x692);
+ uint32_t x731 = cmovznz32(x730, x726, x707);
+ uint32_t x732 = cmovznz32(x730, x723, x704);
+ uint32_t x733 = cmovznz32(x730, x720, x701);
+ uint32_t x734 = cmovznz32(x730, x717, x698);
+ uint32_t x735 = cmovznz32(x730, x714, x695);
+ uint32_t x736 = cmovznz32(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e190m11/feopp.c b/src/Specific/montgomery32_2e190m11/feopp.c
index dd804dde7..c3aa5103a 100644
--- a/src/Specific/montgomery32_2e190m11/feopp.c
+++ b/src/Specific/montgomery32_2e190m11/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21; uint8_t x22 = _subborrow_u32(x19, 0x0, x8, &x21);
   { uint32_t x24; uint8_t x25 = _subborrow_u32(x22, 0x0, x10, &x24);
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, 0x0, x9, &x27);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xfffffff5);
   { uint32_t x32; uint8_t x33 = _addcarryx_u32(0x0, x12, x30, &x32);
   { uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e190m11/feoppDisplay.log b/src/Specific/montgomery32_2e190m11/feoppDisplay.log
index bdd7d6ed3..3a36d2db7 100644
--- a/src/Specific/montgomery32_2e190m11/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e190m11/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = subborrow_u32(x19, 0x0, x8);
  uint32_t x24, uint8_t x25 = subborrow_u32(x22, 0x0, x10);
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, 0x0, x9);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xfffffff5);
  uint32_t x32, uint8_t x33 = addcarryx_u32(0x0, x12, x30);
  uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e190m11/fesub.c b/src/Specific/montgomery32_2e190m11/fesub.c
index 6eab2592e..c1db0ba51 100644
--- a/src/Specific/montgomery32_2e190m11/fesub.c
+++ b/src/Specific/montgomery32_2e190m11/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x34; uint8_t x35 = _subborrow_u32(x32, x11, x21, &x34);
   { uint32_t x37; uint8_t x38 = _subborrow_u32(x35, x13, x23, &x37);
   { uint32_t x40; uint8_t x41 = _subborrow_u32(x38, x12, x22, &x40);
-  { uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+  { uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
   { uint32_t x43 = (x42 & 0xfffffff5);
   { uint32_t x45; uint8_t x46 = _addcarryx_u32(0x0, x25, x43, &x45);
   { uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e190m11/fesubDisplay.log b/src/Specific/montgomery32_2e190m11/fesubDisplay.log
index cb1739389..fc2472ce7 100644
--- a/src/Specific/montgomery32_2e190m11/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e190m11/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x34, uint8_t x35 = subborrow_u32(x32, x11, x21);
  uint32_t x37, uint8_t x38 = subborrow_u32(x35, x13, x23);
  uint32_t x40, uint8_t x41 = subborrow_u32(x38, x12, x22);
- uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+ uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
  uint32_t x43 = (x42 & 0xfffffff5);
  uint32_t x45, uint8_t x46 = addcarryx_u32(0x0, x25, x43);
  uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e191m19/feadd.c b/src/Specific/montgomery32_2e191m19/feadd.c
index 33f9ebc5c..849c7a45e 100644
--- a/src/Specific/montgomery32_2e191m19/feadd.c
+++ b/src/Specific/montgomery32_2e191m19/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x55; uint8_t x56 = _subborrow_u32(x53, x37, 0xffffffff, &x55);
   { uint32_t x58; uint8_t x59 = _subborrow_u32(x56, x40, 0x7fffffff, &x58);
   { uint32_t _; uint8_t x62 = _subborrow_u32(x59, x41, 0x0, &_);
-  { uint32_t x63 = cmovznz(x62, x58, x40);
-  { uint32_t x64 = cmovznz(x62, x55, x37);
-  { uint32_t x65 = cmovznz(x62, x52, x34);
-  { uint32_t x66 = cmovznz(x62, x49, x31);
-  { uint32_t x67 = cmovznz(x62, x46, x28);
-  { uint32_t x68 = cmovznz(x62, x43, x25);
+  { uint32_t x63 = cmovznz32(x62, x58, x40);
+  { uint32_t x64 = cmovznz32(x62, x55, x37);
+  { uint32_t x65 = cmovznz32(x62, x52, x34);
+  { uint32_t x66 = cmovznz32(x62, x49, x31);
+  { uint32_t x67 = cmovznz32(x62, x46, x28);
+  { uint32_t x68 = cmovznz32(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery32_2e191m19/feaddDisplay.log b/src/Specific/montgomery32_2e191m19/feaddDisplay.log
index 824169009..522ef5d71 100644
--- a/src/Specific/montgomery32_2e191m19/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e191m19/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint32_t x55, uint8_t x56 = subborrow_u32(x53, x37, 0xffffffff);
  uint32_t x58, uint8_t x59 = subborrow_u32(x56, x40, 0x7fffffff);
  uint32_t _, uint8_t x62 = subborrow_u32(x59, x41, 0x0);
- uint32_t x63 = cmovznz(x62, x58, x40);
- uint32_t x64 = cmovznz(x62, x55, x37);
- uint32_t x65 = cmovznz(x62, x52, x34);
- uint32_t x66 = cmovznz(x62, x49, x31);
- uint32_t x67 = cmovznz(x62, x46, x28);
- uint32_t x68 = cmovznz(x62, x43, x25);
+ uint32_t x63 = cmovznz32(x62, x58, x40);
+ uint32_t x64 = cmovznz32(x62, x55, x37);
+ uint32_t x65 = cmovznz32(x62, x52, x34);
+ uint32_t x66 = cmovznz32(x62, x49, x31);
+ uint32_t x67 = cmovznz32(x62, x46, x28);
+ uint32_t x68 = cmovznz32(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e191m19/femul.c b/src/Specific/montgomery32_2e191m19/femul.c
index ebb0ee97e..70f742a25 100644
--- a/src/Specific/montgomery32_2e191m19/femul.c
+++ b/src/Specific/montgomery32_2e191m19/femul.c
@@ -250,12 +250,12 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x723; uint8_t x724 = _subborrow_u32(x721, x704, 0xffffffff, &x723);
   { uint32_t x726; uint8_t x727 = _subborrow_u32(x724, x707, 0x7fffffff, &x726);
   { uint32_t _; uint8_t x730 = _subborrow_u32(x727, x709, 0x0, &_);
-  { uint32_t x731 = cmovznz(x730, x726, x707);
-  { uint32_t x732 = cmovznz(x730, x723, x704);
-  { uint32_t x733 = cmovznz(x730, x720, x701);
-  { uint32_t x734 = cmovznz(x730, x717, x698);
-  { uint32_t x735 = cmovznz(x730, x714, x695);
-  { uint32_t x736 = cmovznz(x730, x711, x692);
+  { uint32_t x731 = cmovznz32(x730, x726, x707);
+  { uint32_t x732 = cmovznz32(x730, x723, x704);
+  { uint32_t x733 = cmovznz32(x730, x720, x701);
+  { uint32_t x734 = cmovznz32(x730, x717, x698);
+  { uint32_t x735 = cmovznz32(x730, x714, x695);
+  { uint32_t x736 = cmovznz32(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery32_2e191m19/femulDisplay.log b/src/Specific/montgomery32_2e191m19/femulDisplay.log
index 879e14bf5..7b0e96d28 100644
--- a/src/Specific/montgomery32_2e191m19/femulDisplay.log
+++ b/src/Specific/montgomery32_2e191m19/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint32_t x723, uint8_t x724 = subborrow_u32(x721, x704, 0xffffffff);
  uint32_t x726, uint8_t x727 = subborrow_u32(x724, x707, 0x7fffffff);
  uint32_t _, uint8_t x730 = subborrow_u32(x727, x709, 0x0);
- uint32_t x731 = cmovznz(x730, x726, x707);
- uint32_t x732 = cmovznz(x730, x723, x704);
- uint32_t x733 = cmovznz(x730, x720, x701);
- uint32_t x734 = cmovznz(x730, x717, x698);
- uint32_t x735 = cmovznz(x730, x714, x695);
- uint32_t x736 = cmovznz(x730, x711, x692);
+ uint32_t x731 = cmovznz32(x730, x726, x707);
+ uint32_t x732 = cmovznz32(x730, x723, x704);
+ uint32_t x733 = cmovznz32(x730, x720, x701);
+ uint32_t x734 = cmovznz32(x730, x717, x698);
+ uint32_t x735 = cmovznz32(x730, x714, x695);
+ uint32_t x736 = cmovznz32(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e191m19/feopp.c b/src/Specific/montgomery32_2e191m19/feopp.c
index b72f54a6c..7d6c52941 100644
--- a/src/Specific/montgomery32_2e191m19/feopp.c
+++ b/src/Specific/montgomery32_2e191m19/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21; uint8_t x22 = _subborrow_u32(x19, 0x0, x8, &x21);
   { uint32_t x24; uint8_t x25 = _subborrow_u32(x22, 0x0, x10, &x24);
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, 0x0, x9, &x27);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xffffffed);
   { uint32_t x32; uint8_t x33 = _addcarryx_u32(0x0, x12, x30, &x32);
   { uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e191m19/feoppDisplay.log b/src/Specific/montgomery32_2e191m19/feoppDisplay.log
index bf2afdd2d..eec3da830 100644
--- a/src/Specific/montgomery32_2e191m19/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e191m19/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = subborrow_u32(x19, 0x0, x8);
  uint32_t x24, uint8_t x25 = subborrow_u32(x22, 0x0, x10);
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, 0x0, x9);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xffffffed);
  uint32_t x32, uint8_t x33 = addcarryx_u32(0x0, x12, x30);
  uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e191m19/fesub.c b/src/Specific/montgomery32_2e191m19/fesub.c
index c722fc6d3..9a3cb209c 100644
--- a/src/Specific/montgomery32_2e191m19/fesub.c
+++ b/src/Specific/montgomery32_2e191m19/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x34; uint8_t x35 = _subborrow_u32(x32, x11, x21, &x34);
   { uint32_t x37; uint8_t x38 = _subborrow_u32(x35, x13, x23, &x37);
   { uint32_t x40; uint8_t x41 = _subborrow_u32(x38, x12, x22, &x40);
-  { uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+  { uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
   { uint32_t x43 = (x42 & 0xffffffed);
   { uint32_t x45; uint8_t x46 = _addcarryx_u32(0x0, x25, x43, &x45);
   { uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e191m19/fesubDisplay.log b/src/Specific/montgomery32_2e191m19/fesubDisplay.log
index bc5ea4bdf..25cedd032 100644
--- a/src/Specific/montgomery32_2e191m19/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e191m19/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x34, uint8_t x35 = subborrow_u32(x32, x11, x21);
  uint32_t x37, uint8_t x38 = subborrow_u32(x35, x13, x23);
  uint32_t x40, uint8_t x41 = subborrow_u32(x38, x12, x22);
- uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+ uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
  uint32_t x43 = (x42 & 0xffffffed);
  uint32_t x45, uint8_t x46 = addcarryx_u32(0x0, x25, x43);
  uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e192m2e64m1/feadd.c b/src/Specific/montgomery32_2e192m2e64m1/feadd.c
index ffa2edd13..9357de067 100644
--- a/src/Specific/montgomery32_2e192m2e64m1/feadd.c
+++ b/src/Specific/montgomery32_2e192m2e64m1/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x55; uint8_t x56 = _subborrow_u32(x53, x37, 0xffffffff, &x55);
   { uint32_t x58; uint8_t x59 = _subborrow_u32(x56, x40, 0xffffffff, &x58);
   { uint32_t _; uint8_t x62 = _subborrow_u32(x59, x41, 0x0, &_);
-  { uint32_t x63 = cmovznz(x62, x58, x40);
-  { uint32_t x64 = cmovznz(x62, x55, x37);
-  { uint32_t x65 = cmovznz(x62, x52, x34);
-  { uint32_t x66 = cmovznz(x62, x49, x31);
-  { uint32_t x67 = cmovznz(x62, x46, x28);
-  { uint32_t x68 = cmovznz(x62, x43, x25);
+  { uint32_t x63 = cmovznz32(x62, x58, x40);
+  { uint32_t x64 = cmovznz32(x62, x55, x37);
+  { uint32_t x65 = cmovznz32(x62, x52, x34);
+  { uint32_t x66 = cmovznz32(x62, x49, x31);
+  { uint32_t x67 = cmovznz32(x62, x46, x28);
+  { uint32_t x68 = cmovznz32(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery32_2e192m2e64m1/feaddDisplay.log b/src/Specific/montgomery32_2e192m2e64m1/feaddDisplay.log
index 1a3317225..630037baa 100644
--- a/src/Specific/montgomery32_2e192m2e64m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e192m2e64m1/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint32_t x55, uint8_t x56 = subborrow_u32(x53, x37, 0xffffffff);
  uint32_t x58, uint8_t x59 = subborrow_u32(x56, x40, 0xffffffff);
  uint32_t _, uint8_t x62 = subborrow_u32(x59, x41, 0x0);
- uint32_t x63 = cmovznz(x62, x58, x40);
- uint32_t x64 = cmovznz(x62, x55, x37);
- uint32_t x65 = cmovznz(x62, x52, x34);
- uint32_t x66 = cmovznz(x62, x49, x31);
- uint32_t x67 = cmovznz(x62, x46, x28);
- uint32_t x68 = cmovznz(x62, x43, x25);
+ uint32_t x63 = cmovznz32(x62, x58, x40);
+ uint32_t x64 = cmovznz32(x62, x55, x37);
+ uint32_t x65 = cmovznz32(x62, x52, x34);
+ uint32_t x66 = cmovznz32(x62, x49, x31);
+ uint32_t x67 = cmovznz32(x62, x46, x28);
+ uint32_t x68 = cmovznz32(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e192m2e64m1/femul.c b/src/Specific/montgomery32_2e192m2e64m1/femul.c
index ba6c4f3de..319702b09 100644
--- a/src/Specific/montgomery32_2e192m2e64m1/femul.c
+++ b/src/Specific/montgomery32_2e192m2e64m1/femul.c
@@ -244,12 +244,12 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x705; uint8_t x706 = _subborrow_u32(x703, x686, 0xffffffff, &x705);
   { uint32_t x708; uint8_t x709 = _subborrow_u32(x706, x689, 0xffffffff, &x708);
   { uint32_t _; uint8_t x712 = _subborrow_u32(x709, x691, 0x0, &_);
-  { uint32_t x713 = cmovznz(x712, x708, x689);
-  { uint32_t x714 = cmovznz(x712, x705, x686);
-  { uint32_t x715 = cmovznz(x712, x702, x683);
-  { uint32_t x716 = cmovznz(x712, x699, x680);
-  { uint32_t x717 = cmovznz(x712, x696, x677);
-  { uint32_t x718 = cmovznz(x712, x693, x674);
+  { uint32_t x713 = cmovznz32(x712, x708, x689);
+  { uint32_t x714 = cmovznz32(x712, x705, x686);
+  { uint32_t x715 = cmovznz32(x712, x702, x683);
+  { uint32_t x716 = cmovznz32(x712, x699, x680);
+  { uint32_t x717 = cmovznz32(x712, x696, x677);
+  { uint32_t x718 = cmovznz32(x712, x693, x674);
   out[0] = x718;
   out[1] = x717;
   out[2] = x716;
diff --git a/src/Specific/montgomery32_2e192m2e64m1/femulDisplay.log b/src/Specific/montgomery32_2e192m2e64m1/femulDisplay.log
index 1948ab491..8af983b0d 100644
--- a/src/Specific/montgomery32_2e192m2e64m1/femulDisplay.log
+++ b/src/Specific/montgomery32_2e192m2e64m1/femulDisplay.log
@@ -235,12 +235,12 @@ Interp-η
  uint32_t x705, uint8_t x706 = subborrow_u32(x703, x686, 0xffffffff);
  uint32_t x708, uint8_t x709 = subborrow_u32(x706, x689, 0xffffffff);
  uint32_t _, uint8_t x712 = subborrow_u32(x709, x691, 0x0);
- uint32_t x713 = cmovznz(x712, x708, x689);
- uint32_t x714 = cmovznz(x712, x705, x686);
- uint32_t x715 = cmovznz(x712, x702, x683);
- uint32_t x716 = cmovznz(x712, x699, x680);
- uint32_t x717 = cmovznz(x712, x696, x677);
- uint32_t x718 = cmovznz(x712, x693, x674);
+ uint32_t x713 = cmovznz32(x712, x708, x689);
+ uint32_t x714 = cmovznz32(x712, x705, x686);
+ uint32_t x715 = cmovznz32(x712, x702, x683);
+ uint32_t x716 = cmovznz32(x712, x699, x680);
+ uint32_t x717 = cmovznz32(x712, x696, x677);
+ uint32_t x718 = cmovznz32(x712, x693, x674);
  return (x713, x714, x715, x716, x717, x718))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e192m2e64m1/feopp.c b/src/Specific/montgomery32_2e192m2e64m1/feopp.c
index a0f780530..9e9f82dca 100644
--- a/src/Specific/montgomery32_2e192m2e64m1/feopp.c
+++ b/src/Specific/montgomery32_2e192m2e64m1/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21; uint8_t x22 = _subborrow_u32(x19, 0x0, x8, &x21);
   { uint32_t x24; uint8_t x25 = _subborrow_u32(x22, 0x0, x10, &x24);
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, 0x0, x9, &x27);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xffffffff);
   { uint32_t x32; uint8_t x33 = _addcarryx_u32(0x0, x12, x30, &x32);
   { uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e192m2e64m1/feoppDisplay.log b/src/Specific/montgomery32_2e192m2e64m1/feoppDisplay.log
index 9cc51c96b..e937846f9 100644
--- a/src/Specific/montgomery32_2e192m2e64m1/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e192m2e64m1/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = subborrow_u32(x19, 0x0, x8);
  uint32_t x24, uint8_t x25 = subborrow_u32(x22, 0x0, x10);
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, 0x0, x9);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xffffffff);
  uint32_t x32, uint8_t x33 = addcarryx_u32(0x0, x12, x30);
  uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e192m2e64m1/fesub.c b/src/Specific/montgomery32_2e192m2e64m1/fesub.c
index ea5bdee8f..5c0d60043 100644
--- a/src/Specific/montgomery32_2e192m2e64m1/fesub.c
+++ b/src/Specific/montgomery32_2e192m2e64m1/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x34; uint8_t x35 = _subborrow_u32(x32, x11, x21, &x34);
   { uint32_t x37; uint8_t x38 = _subborrow_u32(x35, x13, x23, &x37);
   { uint32_t x40; uint8_t x41 = _subborrow_u32(x38, x12, x22, &x40);
-  { uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+  { uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
   { uint32_t x43 = (x42 & 0xffffffff);
   { uint32_t x45; uint8_t x46 = _addcarryx_u32(0x0, x25, x43, &x45);
   { uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e192m2e64m1/fesubDisplay.log b/src/Specific/montgomery32_2e192m2e64m1/fesubDisplay.log
index ea523e773..ec794c27f 100644
--- a/src/Specific/montgomery32_2e192m2e64m1/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e192m2e64m1/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x34, uint8_t x35 = subborrow_u32(x32, x11, x21);
  uint32_t x37, uint8_t x38 = subborrow_u32(x35, x13, x23);
  uint32_t x40, uint8_t x41 = subborrow_u32(x38, x12, x22);
- uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+ uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
  uint32_t x43 = (x42 & 0xffffffff);
  uint32_t x45, uint8_t x46 = addcarryx_u32(0x0, x25, x43);
  uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e194m33/feadd.c b/src/Specific/montgomery32_2e194m33/feadd.c
index 28779018c..ba45079f7 100644
--- a/src/Specific/montgomery32_2e194m33/feadd.c
+++ b/src/Specific/montgomery32_2e194m33/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x65; uint8_t x66 = _subborrow_u32(x63, x44, 0xffffffff, &x65);
   { uint32_t x68; uint8_t x69 = _subborrow_u32(x66, x47, 0x3, &x68);
   { uint32_t _; uint8_t x72 = _subborrow_u32(x69, x48, 0x0, &_);
-  { uint32_t x73 = cmovznz(x72, x68, x47);
-  { uint32_t x74 = cmovznz(x72, x65, x44);
-  { uint32_t x75 = cmovznz(x72, x62, x41);
-  { uint32_t x76 = cmovznz(x72, x59, x38);
-  { uint32_t x77 = cmovznz(x72, x56, x35);
-  { uint32_t x78 = cmovznz(x72, x53, x32);
-  { uint32_t x79 = cmovznz(x72, x50, x29);
+  { uint32_t x73 = cmovznz32(x72, x68, x47);
+  { uint32_t x74 = cmovznz32(x72, x65, x44);
+  { uint32_t x75 = cmovznz32(x72, x62, x41);
+  { uint32_t x76 = cmovznz32(x72, x59, x38);
+  { uint32_t x77 = cmovznz32(x72, x56, x35);
+  { uint32_t x78 = cmovznz32(x72, x53, x32);
+  { uint32_t x79 = cmovznz32(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery32_2e194m33/feaddDisplay.log b/src/Specific/montgomery32_2e194m33/feaddDisplay.log
index 5482ec289..c217451c3 100644
--- a/src/Specific/montgomery32_2e194m33/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e194m33/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint32_t x65, uint8_t x66 = subborrow_u32(x63, x44, 0xffffffff);
  uint32_t x68, uint8_t x69 = subborrow_u32(x66, x47, 0x3);
  uint32_t _, uint8_t x72 = subborrow_u32(x69, x48, 0x0);
- uint32_t x73 = cmovznz(x72, x68, x47);
- uint32_t x74 = cmovznz(x72, x65, x44);
- uint32_t x75 = cmovznz(x72, x62, x41);
- uint32_t x76 = cmovznz(x72, x59, x38);
- uint32_t x77 = cmovznz(x72, x56, x35);
- uint32_t x78 = cmovznz(x72, x53, x32);
- uint32_t x79 = cmovznz(x72, x50, x29);
+ uint32_t x73 = cmovznz32(x72, x68, x47);
+ uint32_t x74 = cmovznz32(x72, x65, x44);
+ uint32_t x75 = cmovznz32(x72, x62, x41);
+ uint32_t x76 = cmovznz32(x72, x59, x38);
+ uint32_t x77 = cmovznz32(x72, x56, x35);
+ uint32_t x78 = cmovznz32(x72, x53, x32);
+ uint32_t x79 = cmovznz32(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e196m15/feadd.c b/src/Specific/montgomery32_2e196m15/feadd.c
index eaaaae916..3fe2c20c9 100644
--- a/src/Specific/montgomery32_2e196m15/feadd.c
+++ b/src/Specific/montgomery32_2e196m15/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x65; uint8_t x66 = _subborrow_u32(x63, x44, 0xffffffff, &x65);
   { uint32_t x68; uint8_t x69 = _subborrow_u32(x66, x47, 0xf, &x68);
   { uint32_t _; uint8_t x72 = _subborrow_u32(x69, x48, 0x0, &_);
-  { uint32_t x73 = cmovznz(x72, x68, x47);
-  { uint32_t x74 = cmovznz(x72, x65, x44);
-  { uint32_t x75 = cmovznz(x72, x62, x41);
-  { uint32_t x76 = cmovznz(x72, x59, x38);
-  { uint32_t x77 = cmovznz(x72, x56, x35);
-  { uint32_t x78 = cmovznz(x72, x53, x32);
-  { uint32_t x79 = cmovznz(x72, x50, x29);
+  { uint32_t x73 = cmovznz32(x72, x68, x47);
+  { uint32_t x74 = cmovznz32(x72, x65, x44);
+  { uint32_t x75 = cmovznz32(x72, x62, x41);
+  { uint32_t x76 = cmovznz32(x72, x59, x38);
+  { uint32_t x77 = cmovznz32(x72, x56, x35);
+  { uint32_t x78 = cmovznz32(x72, x53, x32);
+  { uint32_t x79 = cmovznz32(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery32_2e196m15/feaddDisplay.log b/src/Specific/montgomery32_2e196m15/feaddDisplay.log
index e16b54b41..9398047fb 100644
--- a/src/Specific/montgomery32_2e196m15/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e196m15/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint32_t x65, uint8_t x66 = subborrow_u32(x63, x44, 0xffffffff);
  uint32_t x68, uint8_t x69 = subborrow_u32(x66, x47, 0xf);
  uint32_t _, uint8_t x72 = subborrow_u32(x69, x48, 0x0);
- uint32_t x73 = cmovznz(x72, x68, x47);
- uint32_t x74 = cmovznz(x72, x65, x44);
- uint32_t x75 = cmovznz(x72, x62, x41);
- uint32_t x76 = cmovznz(x72, x59, x38);
- uint32_t x77 = cmovznz(x72, x56, x35);
- uint32_t x78 = cmovznz(x72, x53, x32);
- uint32_t x79 = cmovznz(x72, x50, x29);
+ uint32_t x73 = cmovznz32(x72, x68, x47);
+ uint32_t x74 = cmovznz32(x72, x65, x44);
+ uint32_t x75 = cmovznz32(x72, x62, x41);
+ uint32_t x76 = cmovznz32(x72, x59, x38);
+ uint32_t x77 = cmovznz32(x72, x56, x35);
+ uint32_t x78 = cmovznz32(x72, x53, x32);
+ uint32_t x79 = cmovznz32(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e198m17/feadd.c b/src/Specific/montgomery32_2e198m17/feadd.c
index d2b70ab1b..89081d51b 100644
--- a/src/Specific/montgomery32_2e198m17/feadd.c
+++ b/src/Specific/montgomery32_2e198m17/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x65; uint8_t x66 = _subborrow_u32(x63, x44, 0xffffffff, &x65);
   { uint32_t x68; uint8_t x69 = _subborrow_u32(x66, x47, 0x3f, &x68);
   { uint32_t _; uint8_t x72 = _subborrow_u32(x69, x48, 0x0, &_);
-  { uint32_t x73 = cmovznz(x72, x68, x47);
-  { uint32_t x74 = cmovznz(x72, x65, x44);
-  { uint32_t x75 = cmovznz(x72, x62, x41);
-  { uint32_t x76 = cmovznz(x72, x59, x38);
-  { uint32_t x77 = cmovznz(x72, x56, x35);
-  { uint32_t x78 = cmovznz(x72, x53, x32);
-  { uint32_t x79 = cmovznz(x72, x50, x29);
+  { uint32_t x73 = cmovznz32(x72, x68, x47);
+  { uint32_t x74 = cmovznz32(x72, x65, x44);
+  { uint32_t x75 = cmovznz32(x72, x62, x41);
+  { uint32_t x76 = cmovznz32(x72, x59, x38);
+  { uint32_t x77 = cmovznz32(x72, x56, x35);
+  { uint32_t x78 = cmovznz32(x72, x53, x32);
+  { uint32_t x79 = cmovznz32(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery32_2e198m17/feaddDisplay.log b/src/Specific/montgomery32_2e198m17/feaddDisplay.log
index 331f56dea..5d5529301 100644
--- a/src/Specific/montgomery32_2e198m17/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e198m17/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint32_t x65, uint8_t x66 = subborrow_u32(x63, x44, 0xffffffff);
  uint32_t x68, uint8_t x69 = subborrow_u32(x66, x47, 0x3f);
  uint32_t _, uint8_t x72 = subborrow_u32(x69, x48, 0x0);
- uint32_t x73 = cmovznz(x72, x68, x47);
- uint32_t x74 = cmovznz(x72, x65, x44);
- uint32_t x75 = cmovznz(x72, x62, x41);
- uint32_t x76 = cmovznz(x72, x59, x38);
- uint32_t x77 = cmovznz(x72, x56, x35);
- uint32_t x78 = cmovznz(x72, x53, x32);
- uint32_t x79 = cmovznz(x72, x50, x29);
+ uint32_t x73 = cmovznz32(x72, x68, x47);
+ uint32_t x74 = cmovznz32(x72, x65, x44);
+ uint32_t x75 = cmovznz32(x72, x62, x41);
+ uint32_t x76 = cmovznz32(x72, x59, x38);
+ uint32_t x77 = cmovznz32(x72, x56, x35);
+ uint32_t x78 = cmovznz32(x72, x53, x32);
+ uint32_t x79 = cmovznz32(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e205m45x2e198m1/feadd.c b/src/Specific/montgomery32_2e205m45x2e198m1/feadd.c
index bee7a9ecd..b879f8a35 100644
--- a/src/Specific/montgomery32_2e205m45x2e198m1/feadd.c
+++ b/src/Specific/montgomery32_2e205m45x2e198m1/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x65; uint8_t x66 = _subborrow_u32(x63, x44, 0xffffffff, &x65);
   { uint32_t x68; uint8_t x69 = _subborrow_u32(x66, x47, 0x14bf, &x68);
   { uint32_t _; uint8_t x72 = _subborrow_u32(x69, x48, 0x0, &_);
-  { uint32_t x73 = cmovznz(x72, x68, x47);
-  { uint32_t x74 = cmovznz(x72, x65, x44);
-  { uint32_t x75 = cmovznz(x72, x62, x41);
-  { uint32_t x76 = cmovznz(x72, x59, x38);
-  { uint32_t x77 = cmovznz(x72, x56, x35);
-  { uint32_t x78 = cmovznz(x72, x53, x32);
-  { uint32_t x79 = cmovznz(x72, x50, x29);
+  { uint32_t x73 = cmovznz32(x72, x68, x47);
+  { uint32_t x74 = cmovznz32(x72, x65, x44);
+  { uint32_t x75 = cmovznz32(x72, x62, x41);
+  { uint32_t x76 = cmovznz32(x72, x59, x38);
+  { uint32_t x77 = cmovznz32(x72, x56, x35);
+  { uint32_t x78 = cmovznz32(x72, x53, x32);
+  { uint32_t x79 = cmovznz32(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery32_2e205m45x2e198m1/feaddDisplay.log b/src/Specific/montgomery32_2e205m45x2e198m1/feaddDisplay.log
index 5d0bc9380..c0d73efa6 100644
--- a/src/Specific/montgomery32_2e205m45x2e198m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e205m45x2e198m1/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint32_t x65, uint8_t x66 = subborrow_u32(x63, x44, 0xffffffff);
  uint32_t x68, uint8_t x69 = subborrow_u32(x66, x47, 0x14bf);
  uint32_t _, uint8_t x72 = subborrow_u32(x69, x48, 0x0);
- uint32_t x73 = cmovznz(x72, x68, x47);
- uint32_t x74 = cmovznz(x72, x65, x44);
- uint32_t x75 = cmovznz(x72, x62, x41);
- uint32_t x76 = cmovznz(x72, x59, x38);
- uint32_t x77 = cmovznz(x72, x56, x35);
- uint32_t x78 = cmovznz(x72, x53, x32);
- uint32_t x79 = cmovznz(x72, x50, x29);
+ uint32_t x73 = cmovznz32(x72, x68, x47);
+ uint32_t x74 = cmovznz32(x72, x65, x44);
+ uint32_t x75 = cmovznz32(x72, x62, x41);
+ uint32_t x76 = cmovznz32(x72, x59, x38);
+ uint32_t x77 = cmovznz32(x72, x56, x35);
+ uint32_t x78 = cmovznz32(x72, x53, x32);
+ uint32_t x79 = cmovznz32(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e206m5/feadd.c b/src/Specific/montgomery32_2e206m5/feadd.c
index 108156828..e6acc71b8 100644
--- a/src/Specific/montgomery32_2e206m5/feadd.c
+++ b/src/Specific/montgomery32_2e206m5/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x65; uint8_t x66 = _subborrow_u32(x63, x44, 0xffffffff, &x65);
   { uint32_t x68; uint8_t x69 = _subborrow_u32(x66, x47, 0x3fff, &x68);
   { uint32_t _; uint8_t x72 = _subborrow_u32(x69, x48, 0x0, &_);
-  { uint32_t x73 = cmovznz(x72, x68, x47);
-  { uint32_t x74 = cmovznz(x72, x65, x44);
-  { uint32_t x75 = cmovznz(x72, x62, x41);
-  { uint32_t x76 = cmovznz(x72, x59, x38);
-  { uint32_t x77 = cmovznz(x72, x56, x35);
-  { uint32_t x78 = cmovznz(x72, x53, x32);
-  { uint32_t x79 = cmovznz(x72, x50, x29);
+  { uint32_t x73 = cmovznz32(x72, x68, x47);
+  { uint32_t x74 = cmovznz32(x72, x65, x44);
+  { uint32_t x75 = cmovznz32(x72, x62, x41);
+  { uint32_t x76 = cmovznz32(x72, x59, x38);
+  { uint32_t x77 = cmovznz32(x72, x56, x35);
+  { uint32_t x78 = cmovznz32(x72, x53, x32);
+  { uint32_t x79 = cmovznz32(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery32_2e206m5/feaddDisplay.log b/src/Specific/montgomery32_2e206m5/feaddDisplay.log
index f5fca0d88..f74236c7a 100644
--- a/src/Specific/montgomery32_2e206m5/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e206m5/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint32_t x65, uint8_t x66 = subborrow_u32(x63, x44, 0xffffffff);
  uint32_t x68, uint8_t x69 = subborrow_u32(x66, x47, 0x3fff);
  uint32_t _, uint8_t x72 = subborrow_u32(x69, x48, 0x0);
- uint32_t x73 = cmovznz(x72, x68, x47);
- uint32_t x74 = cmovznz(x72, x65, x44);
- uint32_t x75 = cmovznz(x72, x62, x41);
- uint32_t x76 = cmovznz(x72, x59, x38);
- uint32_t x77 = cmovznz(x72, x56, x35);
- uint32_t x78 = cmovznz(x72, x53, x32);
- uint32_t x79 = cmovznz(x72, x50, x29);
+ uint32_t x73 = cmovznz32(x72, x68, x47);
+ uint32_t x74 = cmovznz32(x72, x65, x44);
+ uint32_t x75 = cmovznz32(x72, x62, x41);
+ uint32_t x76 = cmovznz32(x72, x59, x38);
+ uint32_t x77 = cmovznz32(x72, x56, x35);
+ uint32_t x78 = cmovznz32(x72, x53, x32);
+ uint32_t x79 = cmovznz32(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e212m29/feadd.c b/src/Specific/montgomery32_2e212m29/feadd.c
index 7254aeede..c075f0e44 100644
--- a/src/Specific/montgomery32_2e212m29/feadd.c
+++ b/src/Specific/montgomery32_2e212m29/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x65; uint8_t x66 = _subborrow_u32(x63, x44, 0xffffffff, &x65);
   { uint32_t x68; uint8_t x69 = _subborrow_u32(x66, x47, 0xfffff, &x68);
   { uint32_t _; uint8_t x72 = _subborrow_u32(x69, x48, 0x0, &_);
-  { uint32_t x73 = cmovznz(x72, x68, x47);
-  { uint32_t x74 = cmovznz(x72, x65, x44);
-  { uint32_t x75 = cmovznz(x72, x62, x41);
-  { uint32_t x76 = cmovznz(x72, x59, x38);
-  { uint32_t x77 = cmovznz(x72, x56, x35);
-  { uint32_t x78 = cmovznz(x72, x53, x32);
-  { uint32_t x79 = cmovznz(x72, x50, x29);
+  { uint32_t x73 = cmovznz32(x72, x68, x47);
+  { uint32_t x74 = cmovznz32(x72, x65, x44);
+  { uint32_t x75 = cmovznz32(x72, x62, x41);
+  { uint32_t x76 = cmovznz32(x72, x59, x38);
+  { uint32_t x77 = cmovznz32(x72, x56, x35);
+  { uint32_t x78 = cmovznz32(x72, x53, x32);
+  { uint32_t x79 = cmovznz32(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery32_2e212m29/feaddDisplay.log b/src/Specific/montgomery32_2e212m29/feaddDisplay.log
index 9ece67e04..4eb882853 100644
--- a/src/Specific/montgomery32_2e212m29/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e212m29/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint32_t x65, uint8_t x66 = subborrow_u32(x63, x44, 0xffffffff);
  uint32_t x68, uint8_t x69 = subborrow_u32(x66, x47, 0xfffff);
  uint32_t _, uint8_t x72 = subborrow_u32(x69, x48, 0x0);
- uint32_t x73 = cmovznz(x72, x68, x47);
- uint32_t x74 = cmovznz(x72, x65, x44);
- uint32_t x75 = cmovznz(x72, x62, x41);
- uint32_t x76 = cmovznz(x72, x59, x38);
- uint32_t x77 = cmovznz(x72, x56, x35);
- uint32_t x78 = cmovznz(x72, x53, x32);
- uint32_t x79 = cmovznz(x72, x50, x29);
+ uint32_t x73 = cmovznz32(x72, x68, x47);
+ uint32_t x74 = cmovznz32(x72, x65, x44);
+ uint32_t x75 = cmovznz32(x72, x62, x41);
+ uint32_t x76 = cmovznz32(x72, x59, x38);
+ uint32_t x77 = cmovznz32(x72, x56, x35);
+ uint32_t x78 = cmovznz32(x72, x53, x32);
+ uint32_t x79 = cmovznz32(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e213m3/feadd.c b/src/Specific/montgomery32_2e213m3/feadd.c
index d456e7bf6..240511a98 100644
--- a/src/Specific/montgomery32_2e213m3/feadd.c
+++ b/src/Specific/montgomery32_2e213m3/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x65; uint8_t x66 = _subborrow_u32(x63, x44, 0xffffffff, &x65);
   { uint32_t x68; uint8_t x69 = _subborrow_u32(x66, x47, 0x1fffff, &x68);
   { uint32_t _; uint8_t x72 = _subborrow_u32(x69, x48, 0x0, &_);
-  { uint32_t x73 = cmovznz(x72, x68, x47);
-  { uint32_t x74 = cmovznz(x72, x65, x44);
-  { uint32_t x75 = cmovznz(x72, x62, x41);
-  { uint32_t x76 = cmovznz(x72, x59, x38);
-  { uint32_t x77 = cmovznz(x72, x56, x35);
-  { uint32_t x78 = cmovznz(x72, x53, x32);
-  { uint32_t x79 = cmovznz(x72, x50, x29);
+  { uint32_t x73 = cmovznz32(x72, x68, x47);
+  { uint32_t x74 = cmovznz32(x72, x65, x44);
+  { uint32_t x75 = cmovznz32(x72, x62, x41);
+  { uint32_t x76 = cmovznz32(x72, x59, x38);
+  { uint32_t x77 = cmovznz32(x72, x56, x35);
+  { uint32_t x78 = cmovznz32(x72, x53, x32);
+  { uint32_t x79 = cmovznz32(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery32_2e213m3/feaddDisplay.log b/src/Specific/montgomery32_2e213m3/feaddDisplay.log
index d0e679566..1410fe6af 100644
--- a/src/Specific/montgomery32_2e213m3/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e213m3/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint32_t x65, uint8_t x66 = subborrow_u32(x63, x44, 0xffffffff);
  uint32_t x68, uint8_t x69 = subborrow_u32(x66, x47, 0x1fffff);
  uint32_t _, uint8_t x72 = subborrow_u32(x69, x48, 0x0);
- uint32_t x73 = cmovznz(x72, x68, x47);
- uint32_t x74 = cmovznz(x72, x65, x44);
- uint32_t x75 = cmovznz(x72, x62, x41);
- uint32_t x76 = cmovznz(x72, x59, x38);
- uint32_t x77 = cmovznz(x72, x56, x35);
- uint32_t x78 = cmovznz(x72, x53, x32);
- uint32_t x79 = cmovznz(x72, x50, x29);
+ uint32_t x73 = cmovznz32(x72, x68, x47);
+ uint32_t x74 = cmovznz32(x72, x65, x44);
+ uint32_t x75 = cmovznz32(x72, x62, x41);
+ uint32_t x76 = cmovznz32(x72, x59, x38);
+ uint32_t x77 = cmovznz32(x72, x56, x35);
+ uint32_t x78 = cmovznz32(x72, x53, x32);
+ uint32_t x79 = cmovznz32(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e216m2e108m1/feadd.c b/src/Specific/montgomery32_2e216m2e108m1/feadd.c
index 8e9dce267..7ddb08291 100644
--- a/src/Specific/montgomery32_2e216m2e108m1/feadd.c
+++ b/src/Specific/montgomery32_2e216m2e108m1/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x65; uint8_t x66 = _subborrow_u32(x63, x44, 0xffffffff, &x65);
   { uint32_t x68; uint8_t x69 = _subborrow_u32(x66, x47, 0xffffff, &x68);
   { uint32_t _; uint8_t x72 = _subborrow_u32(x69, x48, 0x0, &_);
-  { uint32_t x73 = cmovznz(x72, x68, x47);
-  { uint32_t x74 = cmovznz(x72, x65, x44);
-  { uint32_t x75 = cmovznz(x72, x62, x41);
-  { uint32_t x76 = cmovznz(x72, x59, x38);
-  { uint32_t x77 = cmovznz(x72, x56, x35);
-  { uint32_t x78 = cmovznz(x72, x53, x32);
-  { uint32_t x79 = cmovznz(x72, x50, x29);
+  { uint32_t x73 = cmovznz32(x72, x68, x47);
+  { uint32_t x74 = cmovznz32(x72, x65, x44);
+  { uint32_t x75 = cmovznz32(x72, x62, x41);
+  { uint32_t x76 = cmovznz32(x72, x59, x38);
+  { uint32_t x77 = cmovznz32(x72, x56, x35);
+  { uint32_t x78 = cmovznz32(x72, x53, x32);
+  { uint32_t x79 = cmovznz32(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery32_2e216m2e108m1/feaddDisplay.log b/src/Specific/montgomery32_2e216m2e108m1/feaddDisplay.log
index 49bf497b1..8dd5626ae 100644
--- a/src/Specific/montgomery32_2e216m2e108m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e216m2e108m1/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint32_t x65, uint8_t x66 = subborrow_u32(x63, x44, 0xffffffff);
  uint32_t x68, uint8_t x69 = subborrow_u32(x66, x47, 0xffffff);
  uint32_t _, uint8_t x72 = subborrow_u32(x69, x48, 0x0);
- uint32_t x73 = cmovznz(x72, x68, x47);
- uint32_t x74 = cmovznz(x72, x65, x44);
- uint32_t x75 = cmovznz(x72, x62, x41);
- uint32_t x76 = cmovznz(x72, x59, x38);
- uint32_t x77 = cmovznz(x72, x56, x35);
- uint32_t x78 = cmovznz(x72, x53, x32);
- uint32_t x79 = cmovznz(x72, x50, x29);
+ uint32_t x73 = cmovznz32(x72, x68, x47);
+ uint32_t x74 = cmovznz32(x72, x65, x44);
+ uint32_t x75 = cmovznz32(x72, x62, x41);
+ uint32_t x76 = cmovznz32(x72, x59, x38);
+ uint32_t x77 = cmovznz32(x72, x56, x35);
+ uint32_t x78 = cmovznz32(x72, x53, x32);
+ uint32_t x79 = cmovznz32(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e221m3/feadd.c b/src/Specific/montgomery32_2e221m3/feadd.c
index db31a1b9e..abe3c2d31 100644
--- a/src/Specific/montgomery32_2e221m3/feadd.c
+++ b/src/Specific/montgomery32_2e221m3/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x65; uint8_t x66 = _subborrow_u32(x63, x44, 0xffffffff, &x65);
   { uint32_t x68; uint8_t x69 = _subborrow_u32(x66, x47, 0x1fffffff, &x68);
   { uint32_t _; uint8_t x72 = _subborrow_u32(x69, x48, 0x0, &_);
-  { uint32_t x73 = cmovznz(x72, x68, x47);
-  { uint32_t x74 = cmovznz(x72, x65, x44);
-  { uint32_t x75 = cmovznz(x72, x62, x41);
-  { uint32_t x76 = cmovznz(x72, x59, x38);
-  { uint32_t x77 = cmovznz(x72, x56, x35);
-  { uint32_t x78 = cmovznz(x72, x53, x32);
-  { uint32_t x79 = cmovznz(x72, x50, x29);
+  { uint32_t x73 = cmovznz32(x72, x68, x47);
+  { uint32_t x74 = cmovznz32(x72, x65, x44);
+  { uint32_t x75 = cmovznz32(x72, x62, x41);
+  { uint32_t x76 = cmovznz32(x72, x59, x38);
+  { uint32_t x77 = cmovznz32(x72, x56, x35);
+  { uint32_t x78 = cmovznz32(x72, x53, x32);
+  { uint32_t x79 = cmovznz32(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery32_2e221m3/feaddDisplay.log b/src/Specific/montgomery32_2e221m3/feaddDisplay.log
index 896d3dab9..9586e9d0b 100644
--- a/src/Specific/montgomery32_2e221m3/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e221m3/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint32_t x65, uint8_t x66 = subborrow_u32(x63, x44, 0xffffffff);
  uint32_t x68, uint8_t x69 = subborrow_u32(x66, x47, 0x1fffffff);
  uint32_t _, uint8_t x72 = subborrow_u32(x69, x48, 0x0);
- uint32_t x73 = cmovznz(x72, x68, x47);
- uint32_t x74 = cmovznz(x72, x65, x44);
- uint32_t x75 = cmovznz(x72, x62, x41);
- uint32_t x76 = cmovznz(x72, x59, x38);
- uint32_t x77 = cmovznz(x72, x56, x35);
- uint32_t x78 = cmovznz(x72, x53, x32);
- uint32_t x79 = cmovznz(x72, x50, x29);
+ uint32_t x73 = cmovznz32(x72, x68, x47);
+ uint32_t x74 = cmovznz32(x72, x65, x44);
+ uint32_t x75 = cmovznz32(x72, x62, x41);
+ uint32_t x76 = cmovznz32(x72, x59, x38);
+ uint32_t x77 = cmovznz32(x72, x56, x35);
+ uint32_t x78 = cmovznz32(x72, x53, x32);
+ uint32_t x79 = cmovznz32(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e222m117/feadd.c b/src/Specific/montgomery32_2e222m117/feadd.c
index 8c8943b7b..b687807e2 100644
--- a/src/Specific/montgomery32_2e222m117/feadd.c
+++ b/src/Specific/montgomery32_2e222m117/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x65; uint8_t x66 = _subborrow_u32(x63, x44, 0xffffffff, &x65);
   { uint32_t x68; uint8_t x69 = _subborrow_u32(x66, x47, 0x3fffffff, &x68);
   { uint32_t _; uint8_t x72 = _subborrow_u32(x69, x48, 0x0, &_);
-  { uint32_t x73 = cmovznz(x72, x68, x47);
-  { uint32_t x74 = cmovznz(x72, x65, x44);
-  { uint32_t x75 = cmovznz(x72, x62, x41);
-  { uint32_t x76 = cmovznz(x72, x59, x38);
-  { uint32_t x77 = cmovznz(x72, x56, x35);
-  { uint32_t x78 = cmovznz(x72, x53, x32);
-  { uint32_t x79 = cmovznz(x72, x50, x29);
+  { uint32_t x73 = cmovznz32(x72, x68, x47);
+  { uint32_t x74 = cmovznz32(x72, x65, x44);
+  { uint32_t x75 = cmovznz32(x72, x62, x41);
+  { uint32_t x76 = cmovznz32(x72, x59, x38);
+  { uint32_t x77 = cmovznz32(x72, x56, x35);
+  { uint32_t x78 = cmovznz32(x72, x53, x32);
+  { uint32_t x79 = cmovznz32(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery32_2e222m117/feaddDisplay.log b/src/Specific/montgomery32_2e222m117/feaddDisplay.log
index 2a61df6e4..42c686f39 100644
--- a/src/Specific/montgomery32_2e222m117/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e222m117/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint32_t x65, uint8_t x66 = subborrow_u32(x63, x44, 0xffffffff);
  uint32_t x68, uint8_t x69 = subborrow_u32(x66, x47, 0x3fffffff);
  uint32_t _, uint8_t x72 = subborrow_u32(x69, x48, 0x0);
- uint32_t x73 = cmovznz(x72, x68, x47);
- uint32_t x74 = cmovznz(x72, x65, x44);
- uint32_t x75 = cmovznz(x72, x62, x41);
- uint32_t x76 = cmovznz(x72, x59, x38);
- uint32_t x77 = cmovznz(x72, x56, x35);
- uint32_t x78 = cmovznz(x72, x53, x32);
- uint32_t x79 = cmovznz(x72, x50, x29);
+ uint32_t x73 = cmovznz32(x72, x68, x47);
+ uint32_t x74 = cmovznz32(x72, x65, x44);
+ uint32_t x75 = cmovznz32(x72, x62, x41);
+ uint32_t x76 = cmovznz32(x72, x59, x38);
+ uint32_t x77 = cmovznz32(x72, x56, x35);
+ uint32_t x78 = cmovznz32(x72, x53, x32);
+ uint32_t x79 = cmovznz32(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e224m2e96p1/feadd.c b/src/Specific/montgomery32_2e224m2e96p1/feadd.c
index dfe41b61b..accfe4540 100644
--- a/src/Specific/montgomery32_2e224m2e96p1/feadd.c
+++ b/src/Specific/montgomery32_2e224m2e96p1/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x65; uint8_t x66 = _subborrow_u32(x63, x44, 0xffffffff, &x65);
   { uint32_t x68; uint8_t x69 = _subborrow_u32(x66, x47, 0xffffffff, &x68);
   { uint32_t _; uint8_t x72 = _subborrow_u32(x69, x48, 0x0, &_);
-  { uint32_t x73 = cmovznz(x72, x68, x47);
-  { uint32_t x74 = cmovznz(x72, x65, x44);
-  { uint32_t x75 = cmovznz(x72, x62, x41);
-  { uint32_t x76 = cmovznz(x72, x59, x38);
-  { uint32_t x77 = cmovznz(x72, x56, x35);
-  { uint32_t x78 = cmovznz(x72, x53, x32);
-  { uint32_t x79 = cmovznz(x72, x50, x29);
+  { uint32_t x73 = cmovznz32(x72, x68, x47);
+  { uint32_t x74 = cmovznz32(x72, x65, x44);
+  { uint32_t x75 = cmovznz32(x72, x62, x41);
+  { uint32_t x76 = cmovznz32(x72, x59, x38);
+  { uint32_t x77 = cmovznz32(x72, x56, x35);
+  { uint32_t x78 = cmovznz32(x72, x53, x32);
+  { uint32_t x79 = cmovznz32(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery32_2e224m2e96p1/feaddDisplay.log b/src/Specific/montgomery32_2e224m2e96p1/feaddDisplay.log
index b182b0821..e35ab18d5 100644
--- a/src/Specific/montgomery32_2e224m2e96p1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e224m2e96p1/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint32_t x65, uint8_t x66 = subborrow_u32(x63, x44, 0xffffffff);
  uint32_t x68, uint8_t x69 = subborrow_u32(x66, x47, 0xffffffff);
  uint32_t _, uint8_t x72 = subborrow_u32(x69, x48, 0x0);
- uint32_t x73 = cmovznz(x72, x68, x47);
- uint32_t x74 = cmovznz(x72, x65, x44);
- uint32_t x75 = cmovznz(x72, x62, x41);
- uint32_t x76 = cmovznz(x72, x59, x38);
- uint32_t x77 = cmovznz(x72, x56, x35);
- uint32_t x78 = cmovznz(x72, x53, x32);
- uint32_t x79 = cmovznz(x72, x50, x29);
+ uint32_t x73 = cmovznz32(x72, x68, x47);
+ uint32_t x74 = cmovznz32(x72, x65, x44);
+ uint32_t x75 = cmovznz32(x72, x62, x41);
+ uint32_t x76 = cmovznz32(x72, x59, x38);
+ uint32_t x77 = cmovznz32(x72, x56, x35);
+ uint32_t x78 = cmovznz32(x72, x53, x32);
+ uint32_t x79 = cmovznz32(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e224m2e96p1/femul.c b/src/Specific/montgomery32_2e224m2e96p1/femul.c
index a08b0ab8c..7adbf4aa3 100644
--- a/src/Specific/montgomery32_2e224m2e96p1/femul.c
+++ b/src/Specific/montgomery32_2e224m2e96p1/femul.c
@@ -306,13 +306,13 @@ static void femul(uint32_t out[7], const uint32_t in1[7], const uint32_t in2[7])
   { uint32_t x859; uint8_t x860 = _subborrow_u32(x857, x837, 0xffffffff, &x859);
   { uint32_t x862; uint8_t x863 = _subborrow_u32(x860, x840, 0xffffffff, &x862);
   { uint32_t _; uint8_t x866 = _subborrow_u32(x863, x842, 0x0, &_);
-  { uint32_t x867 = cmovznz(x866, x862, x840);
-  { uint32_t x868 = cmovznz(x866, x859, x837);
-  { uint32_t x869 = cmovznz(x866, x856, x834);
-  { uint32_t x870 = cmovznz(x866, x853, x831);
-  { uint32_t x871 = cmovznz(x866, x850, x828);
-  { uint32_t x872 = cmovznz(x866, x847, x825);
-  { uint32_t x873 = cmovznz(x866, x844, x822);
+  { uint32_t x867 = cmovznz32(x866, x862, x840);
+  { uint32_t x868 = cmovznz32(x866, x859, x837);
+  { uint32_t x869 = cmovznz32(x866, x856, x834);
+  { uint32_t x870 = cmovznz32(x866, x853, x831);
+  { uint32_t x871 = cmovznz32(x866, x850, x828);
+  { uint32_t x872 = cmovznz32(x866, x847, x825);
+  { uint32_t x873 = cmovznz32(x866, x844, x822);
   out[0] = x873;
   out[1] = x872;
   out[2] = x871;
diff --git a/src/Specific/montgomery32_2e224m2e96p1/femulDisplay.log b/src/Specific/montgomery32_2e224m2e96p1/femulDisplay.log
index cca4d7295..09714b474 100644
--- a/src/Specific/montgomery32_2e224m2e96p1/femulDisplay.log
+++ b/src/Specific/montgomery32_2e224m2e96p1/femulDisplay.log
@@ -295,13 +295,13 @@ Interp-η
  uint32_t x859, uint8_t x860 = subborrow_u32(x857, x837, 0xffffffff);
  uint32_t x862, uint8_t x863 = subborrow_u32(x860, x840, 0xffffffff);
  uint32_t _, uint8_t x866 = subborrow_u32(x863, x842, 0x0);
- uint32_t x867 = cmovznz(x866, x862, x840);
- uint32_t x868 = cmovznz(x866, x859, x837);
- uint32_t x869 = cmovznz(x866, x856, x834);
- uint32_t x870 = cmovznz(x866, x853, x831);
- uint32_t x871 = cmovznz(x866, x850, x828);
- uint32_t x872 = cmovznz(x866, x847, x825);
- uint32_t x873 = cmovznz(x866, x844, x822);
+ uint32_t x867 = cmovznz32(x866, x862, x840);
+ uint32_t x868 = cmovznz32(x866, x859, x837);
+ uint32_t x869 = cmovznz32(x866, x856, x834);
+ uint32_t x870 = cmovznz32(x866, x853, x831);
+ uint32_t x871 = cmovznz32(x866, x850, x828);
+ uint32_t x872 = cmovznz32(x866, x847, x825);
+ uint32_t x873 = cmovznz32(x866, x844, x822);
  return (x867, x868, x869, x870, x871, x872, x873))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e226m5/feadd.c b/src/Specific/montgomery32_2e226m5/feadd.c
index be4e3c5fe..e2743057b 100644
--- a/src/Specific/montgomery32_2e226m5/feadd.c
+++ b/src/Specific/montgomery32_2e226m5/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0x3, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e226m5/feaddDisplay.log b/src/Specific/montgomery32_2e226m5/feaddDisplay.log
index 14d516cfe..9b27bb47f 100644
--- a/src/Specific/montgomery32_2e226m5/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e226m5/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0x3);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e230m27/feadd.c b/src/Specific/montgomery32_2e230m27/feadd.c
index 03a448fac..0b93efdbf 100644
--- a/src/Specific/montgomery32_2e230m27/feadd.c
+++ b/src/Specific/montgomery32_2e230m27/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0x3f, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e230m27/feaddDisplay.log b/src/Specific/montgomery32_2e230m27/feaddDisplay.log
index d47369cd5..3b3330e0d 100644
--- a/src/Specific/montgomery32_2e230m27/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e230m27/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0x3f);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e235m15/feadd.c b/src/Specific/montgomery32_2e235m15/feadd.c
index 2a86e1040..a3c0c6920 100644
--- a/src/Specific/montgomery32_2e235m15/feadd.c
+++ b/src/Specific/montgomery32_2e235m15/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0x7ff, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e235m15/feaddDisplay.log b/src/Specific/montgomery32_2e235m15/feaddDisplay.log
index 01a762a6a..85a026c3e 100644
--- a/src/Specific/montgomery32_2e235m15/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e235m15/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0x7ff);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e243m9/feadd.c b/src/Specific/montgomery32_2e243m9/feadd.c
index b06c2c424..f3ec8140b 100644
--- a/src/Specific/montgomery32_2e243m9/feadd.c
+++ b/src/Specific/montgomery32_2e243m9/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0x7ffff, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e243m9/feaddDisplay.log b/src/Specific/montgomery32_2e243m9/feaddDisplay.log
index 90e51d238..8c7f833ea 100644
--- a/src/Specific/montgomery32_2e243m9/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e243m9/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0x7ffff);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e251m9/feadd.c b/src/Specific/montgomery32_2e251m9/feadd.c
index 6fc615365..cfd21c577 100644
--- a/src/Specific/montgomery32_2e251m9/feadd.c
+++ b/src/Specific/montgomery32_2e251m9/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0x7ffffff, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e251m9/feaddDisplay.log b/src/Specific/montgomery32_2e251m9/feaddDisplay.log
index a29dffa3f..34bfeae75 100644
--- a/src/Specific/montgomery32_2e251m9/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e251m9/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0x7ffffff);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e254m127x2e240m1/feadd.c b/src/Specific/montgomery32_2e254m127x2e240m1/feadd.c
index 81ecde594..6ffed3913 100644
--- a/src/Specific/montgomery32_2e254m127x2e240m1/feadd.c
+++ b/src/Specific/montgomery32_2e254m127x2e240m1/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0x3f80ffff, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e254m127x2e240m1/feaddDisplay.log b/src/Specific/montgomery32_2e254m127x2e240m1/feaddDisplay.log
index 85272488d..846e6f58d 100644
--- a/src/Specific/montgomery32_2e254m127x2e240m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e254m127x2e240m1/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0x3f80ffff);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e255m19/feadd.c b/src/Specific/montgomery32_2e255m19/feadd.c
index e4f8afd79..898843dd3 100644
--- a/src/Specific/montgomery32_2e255m19/feadd.c
+++ b/src/Specific/montgomery32_2e255m19/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0x7fffffff, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e255m19/feaddDisplay.log b/src/Specific/montgomery32_2e255m19/feaddDisplay.log
index 5d89df82d..94c173f05 100644
--- a/src/Specific/montgomery32_2e255m19/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e255m19/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0x7fffffff);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e255m2e4m2e1m1/feadd.c b/src/Specific/montgomery32_2e255m2e4m2e1m1/feadd.c
index e4f8afd79..898843dd3 100644
--- a/src/Specific/montgomery32_2e255m2e4m2e1m1/feadd.c
+++ b/src/Specific/montgomery32_2e255m2e4m2e1m1/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0x7fffffff, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e255m2e4m2e1m1/feaddDisplay.log b/src/Specific/montgomery32_2e255m2e4m2e1m1/feaddDisplay.log
index 5d89df82d..94c173f05 100644
--- a/src/Specific/montgomery32_2e255m2e4m2e1m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e255m2e4m2e1m1/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0x7fffffff);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e255m765/feadd.c b/src/Specific/montgomery32_2e255m765/feadd.c
index 44c42965c..c8a728e51 100644
--- a/src/Specific/montgomery32_2e255m765/feadd.c
+++ b/src/Specific/montgomery32_2e255m765/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0x7fffffff, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e255m765/feaddDisplay.log b/src/Specific/montgomery32_2e255m765/feaddDisplay.log
index 92ef5f42f..dd7712447 100644
--- a/src/Specific/montgomery32_2e255m765/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e255m765/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0x7fffffff);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e256m189/feadd.c b/src/Specific/montgomery32_2e256m189/feadd.c
index fa44e6837..d06e9223e 100644
--- a/src/Specific/montgomery32_2e256m189/feadd.c
+++ b/src/Specific/montgomery32_2e256m189/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0xffffffff, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e256m189/feaddDisplay.log b/src/Specific/montgomery32_2e256m189/feaddDisplay.log
index 20feee74c..f20b63443 100644
--- a/src/Specific/montgomery32_2e256m189/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e256m189/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0xffffffff);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e256m2e224p2e192p2e96m1/feadd.c b/src/Specific/montgomery32_2e256m2e224p2e192p2e96m1/feadd.c
index 77ab95b28..6dc8ca44c 100644
--- a/src/Specific/montgomery32_2e256m2e224p2e192p2e96m1/feadd.c
+++ b/src/Specific/montgomery32_2e256m2e224p2e192p2e96m1/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0x1, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0xffffffff, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e256m2e224p2e192p2e96m1/feaddDisplay.log b/src/Specific/montgomery32_2e256m2e224p2e192p2e96m1/feaddDisplay.log
index 3fcfc0358..6ce2399b9 100644
--- a/src/Specific/montgomery32_2e256m2e224p2e192p2e96m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e256m2e224p2e192p2e96m1/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0x1);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0xffffffff);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e256m2e32m977/feadd.c b/src/Specific/montgomery32_2e256m2e32m977/feadd.c
index 2fbefd03e..d63a79de9 100644
--- a/src/Specific/montgomery32_2e256m2e32m977/feadd.c
+++ b/src/Specific/montgomery32_2e256m2e32m977/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0xffffffff, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e256m2e32m977/feaddDisplay.log b/src/Specific/montgomery32_2e256m2e32m977/feaddDisplay.log
index 47e22543e..ae0590e29 100644
--- a/src/Specific/montgomery32_2e256m2e32m977/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e256m2e32m977/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0xffffffff);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e256m88x2e240m1/feadd.c b/src/Specific/montgomery32_2e256m88x2e240m1/feadd.c
index bdc9dd0dd..056dbba53 100644
--- a/src/Specific/montgomery32_2e256m88x2e240m1/feadd.c
+++ b/src/Specific/montgomery32_2e256m88x2e240m1/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8])
   { uint32_t x75; uint8_t x76 = _subborrow_u32(x73, x51, 0xffffffff, &x75);
   { uint32_t x78; uint8_t x79 = _subborrow_u32(x76, x54, 0xffa7ffff, &x78);
   { uint32_t _; uint8_t x82 = _subborrow_u32(x79, x55, 0x0, &_);
-  { uint32_t x83 = cmovznz(x82, x78, x54);
-  { uint32_t x84 = cmovznz(x82, x75, x51);
-  { uint32_t x85 = cmovznz(x82, x72, x48);
-  { uint32_t x86 = cmovznz(x82, x69, x45);
-  { uint32_t x87 = cmovznz(x82, x66, x42);
-  { uint32_t x88 = cmovznz(x82, x63, x39);
-  { uint32_t x89 = cmovznz(x82, x60, x36);
-  { uint32_t x90 = cmovznz(x82, x57, x33);
+  { uint32_t x83 = cmovznz32(x82, x78, x54);
+  { uint32_t x84 = cmovznz32(x82, x75, x51);
+  { uint32_t x85 = cmovznz32(x82, x72, x48);
+  { uint32_t x86 = cmovznz32(x82, x69, x45);
+  { uint32_t x87 = cmovznz32(x82, x66, x42);
+  { uint32_t x88 = cmovznz32(x82, x63, x39);
+  { uint32_t x89 = cmovznz32(x82, x60, x36);
+  { uint32_t x90 = cmovznz32(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery32_2e256m88x2e240m1/feaddDisplay.log b/src/Specific/montgomery32_2e256m88x2e240m1/feaddDisplay.log
index b0753a2c4..c4b54ef1d 100644
--- a/src/Specific/montgomery32_2e256m88x2e240m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e256m88x2e240m1/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint32_t x75, uint8_t x76 = subborrow_u32(x73, x51, 0xffffffff);
  uint32_t x78, uint8_t x79 = subborrow_u32(x76, x54, 0xffa7ffff);
  uint32_t _, uint8_t x82 = subborrow_u32(x79, x55, 0x0);
- uint32_t x83 = cmovznz(x82, x78, x54);
- uint32_t x84 = cmovznz(x82, x75, x51);
- uint32_t x85 = cmovznz(x82, x72, x48);
- uint32_t x86 = cmovznz(x82, x69, x45);
- uint32_t x87 = cmovznz(x82, x66, x42);
- uint32_t x88 = cmovznz(x82, x63, x39);
- uint32_t x89 = cmovznz(x82, x60, x36);
- uint32_t x90 = cmovznz(x82, x57, x33);
+ uint32_t x83 = cmovznz32(x82, x78, x54);
+ uint32_t x84 = cmovznz32(x82, x75, x51);
+ uint32_t x85 = cmovznz32(x82, x72, x48);
+ uint32_t x86 = cmovznz32(x82, x69, x45);
+ uint32_t x87 = cmovznz32(x82, x66, x42);
+ uint32_t x88 = cmovznz32(x82, x63, x39);
+ uint32_t x89 = cmovznz32(x82, x60, x36);
+ uint32_t x90 = cmovznz32(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e266m3/feadd.c b/src/Specific/montgomery32_2e266m3/feadd.c
index d3ccc7460..c59fa710c 100644
--- a/src/Specific/montgomery32_2e266m3/feadd.c
+++ b/src/Specific/montgomery32_2e266m3/feadd.c
@@ -36,15 +36,15 @@ static void feadd(uint32_t out[9], const uint32_t in1[9], const uint32_t in2[9])
   { uint32_t x85; uint8_t x86 = _subborrow_u32(x83, x58, 0xffffffff, &x85);
   { uint32_t x88; uint8_t x89 = _subborrow_u32(x86, x61, 0x3ff, &x88);
   { uint32_t _; uint8_t x92 = _subborrow_u32(x89, x62, 0x0, &_);
-  { uint32_t x93 = cmovznz(x92, x88, x61);
-  { uint32_t x94 = cmovznz(x92, x85, x58);
-  { uint32_t x95 = cmovznz(x92, x82, x55);
-  { uint32_t x96 = cmovznz(x92, x79, x52);
-  { uint32_t x97 = cmovznz(x92, x76, x49);
-  { uint32_t x98 = cmovznz(x92, x73, x46);
-  { uint32_t x99 = cmovznz(x92, x70, x43);
-  { uint32_t x100 = cmovznz(x92, x67, x40);
-  { uint32_t x101 = cmovznz(x92, x64, x37);
+  { uint32_t x93 = cmovznz32(x92, x88, x61);
+  { uint32_t x94 = cmovznz32(x92, x85, x58);
+  { uint32_t x95 = cmovznz32(x92, x82, x55);
+  { uint32_t x96 = cmovznz32(x92, x79, x52);
+  { uint32_t x97 = cmovznz32(x92, x76, x49);
+  { uint32_t x98 = cmovznz32(x92, x73, x46);
+  { uint32_t x99 = cmovznz32(x92, x70, x43);
+  { uint32_t x100 = cmovznz32(x92, x67, x40);
+  { uint32_t x101 = cmovznz32(x92, x64, x37);
   out[0] = x101;
   out[1] = x100;
   out[2] = x99;
diff --git a/src/Specific/montgomery32_2e266m3/feaddDisplay.log b/src/Specific/montgomery32_2e266m3/feaddDisplay.log
index 3d72d406d..de4f4c7bf 100644
--- a/src/Specific/montgomery32_2e266m3/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e266m3/feaddDisplay.log
@@ -21,15 +21,15 @@ Interp-η
  uint32_t x85, uint8_t x86 = subborrow_u32(x83, x58, 0xffffffff);
  uint32_t x88, uint8_t x89 = subborrow_u32(x86, x61, 0x3ff);
  uint32_t _, uint8_t x92 = subborrow_u32(x89, x62, 0x0);
- uint32_t x93 = cmovznz(x92, x88, x61);
- uint32_t x94 = cmovznz(x92, x85, x58);
- uint32_t x95 = cmovznz(x92, x82, x55);
- uint32_t x96 = cmovznz(x92, x79, x52);
- uint32_t x97 = cmovznz(x92, x76, x49);
- uint32_t x98 = cmovznz(x92, x73, x46);
- uint32_t x99 = cmovznz(x92, x70, x43);
- uint32_t x100 = cmovznz(x92, x67, x40);
- uint32_t x101 = cmovznz(x92, x64, x37);
+ uint32_t x93 = cmovznz32(x92, x88, x61);
+ uint32_t x94 = cmovznz32(x92, x85, x58);
+ uint32_t x95 = cmovznz32(x92, x82, x55);
+ uint32_t x96 = cmovznz32(x92, x79, x52);
+ uint32_t x97 = cmovznz32(x92, x76, x49);
+ uint32_t x98 = cmovznz32(x92, x73, x46);
+ uint32_t x99 = cmovznz32(x92, x70, x43);
+ uint32_t x100 = cmovznz32(x92, x67, x40);
+ uint32_t x101 = cmovznz32(x92, x64, x37);
  return (x93, x94, x95, x96, x97, x98, x99, x100, x101))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e285m9/feadd.c b/src/Specific/montgomery32_2e285m9/feadd.c
index e22f39262..2d47c9464 100644
--- a/src/Specific/montgomery32_2e285m9/feadd.c
+++ b/src/Specific/montgomery32_2e285m9/feadd.c
@@ -36,15 +36,15 @@ static void feadd(uint32_t out[9], const uint32_t in1[9], const uint32_t in2[9])
   { uint32_t x85; uint8_t x86 = _subborrow_u32(x83, x58, 0xffffffff, &x85);
   { uint32_t x88; uint8_t x89 = _subborrow_u32(x86, x61, 0x1fffffff, &x88);
   { uint32_t _; uint8_t x92 = _subborrow_u32(x89, x62, 0x0, &_);
-  { uint32_t x93 = cmovznz(x92, x88, x61);
-  { uint32_t x94 = cmovznz(x92, x85, x58);
-  { uint32_t x95 = cmovznz(x92, x82, x55);
-  { uint32_t x96 = cmovznz(x92, x79, x52);
-  { uint32_t x97 = cmovznz(x92, x76, x49);
-  { uint32_t x98 = cmovznz(x92, x73, x46);
-  { uint32_t x99 = cmovznz(x92, x70, x43);
-  { uint32_t x100 = cmovznz(x92, x67, x40);
-  { uint32_t x101 = cmovznz(x92, x64, x37);
+  { uint32_t x93 = cmovznz32(x92, x88, x61);
+  { uint32_t x94 = cmovznz32(x92, x85, x58);
+  { uint32_t x95 = cmovznz32(x92, x82, x55);
+  { uint32_t x96 = cmovznz32(x92, x79, x52);
+  { uint32_t x97 = cmovznz32(x92, x76, x49);
+  { uint32_t x98 = cmovznz32(x92, x73, x46);
+  { uint32_t x99 = cmovznz32(x92, x70, x43);
+  { uint32_t x100 = cmovznz32(x92, x67, x40);
+  { uint32_t x101 = cmovznz32(x92, x64, x37);
   out[0] = x101;
   out[1] = x100;
   out[2] = x99;
diff --git a/src/Specific/montgomery32_2e285m9/feaddDisplay.log b/src/Specific/montgomery32_2e285m9/feaddDisplay.log
index 73f337088..1dabeafdc 100644
--- a/src/Specific/montgomery32_2e285m9/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e285m9/feaddDisplay.log
@@ -21,15 +21,15 @@ Interp-η
  uint32_t x85, uint8_t x86 = subborrow_u32(x83, x58, 0xffffffff);
  uint32_t x88, uint8_t x89 = subborrow_u32(x86, x61, 0x1fffffff);
  uint32_t _, uint8_t x92 = subborrow_u32(x89, x62, 0x0);
- uint32_t x93 = cmovznz(x92, x88, x61);
- uint32_t x94 = cmovznz(x92, x85, x58);
- uint32_t x95 = cmovznz(x92, x82, x55);
- uint32_t x96 = cmovznz(x92, x79, x52);
- uint32_t x97 = cmovznz(x92, x76, x49);
- uint32_t x98 = cmovznz(x92, x73, x46);
- uint32_t x99 = cmovznz(x92, x70, x43);
- uint32_t x100 = cmovznz(x92, x67, x40);
- uint32_t x101 = cmovznz(x92, x64, x37);
+ uint32_t x93 = cmovznz32(x92, x88, x61);
+ uint32_t x94 = cmovznz32(x92, x85, x58);
+ uint32_t x95 = cmovznz32(x92, x82, x55);
+ uint32_t x96 = cmovznz32(x92, x79, x52);
+ uint32_t x97 = cmovznz32(x92, x76, x49);
+ uint32_t x98 = cmovznz32(x92, x73, x46);
+ uint32_t x99 = cmovznz32(x92, x70, x43);
+ uint32_t x100 = cmovznz32(x92, x67, x40);
+ uint32_t x101 = cmovznz32(x92, x64, x37);
  return (x93, x94, x95, x96, x97, x98, x99, x100, x101))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e291m19/feadd.c b/src/Specific/montgomery32_2e291m19/feadd.c
index d8b4e10e6..999094fe2 100644
--- a/src/Specific/montgomery32_2e291m19/feadd.c
+++ b/src/Specific/montgomery32_2e291m19/feadd.c
@@ -40,16 +40,16 @@ static void feadd(uint32_t out[10], const uint32_t in1[10], const uint32_t in2[1
   { uint32_t x95; uint8_t x96 = _subborrow_u32(x93, x65, 0xffffffff, &x95);
   { uint32_t x98; uint8_t x99 = _subborrow_u32(x96, x68, 0x7, &x98);
   { uint32_t _; uint8_t x102 = _subborrow_u32(x99, x69, 0x0, &_);
-  { uint32_t x103 = cmovznz(x102, x98, x68);
-  { uint32_t x104 = cmovznz(x102, x95, x65);
-  { uint32_t x105 = cmovznz(x102, x92, x62);
-  { uint32_t x106 = cmovznz(x102, x89, x59);
-  { uint32_t x107 = cmovznz(x102, x86, x56);
-  { uint32_t x108 = cmovznz(x102, x83, x53);
-  { uint32_t x109 = cmovznz(x102, x80, x50);
-  { uint32_t x110 = cmovznz(x102, x77, x47);
-  { uint32_t x111 = cmovznz(x102, x74, x44);
-  { uint32_t x112 = cmovznz(x102, x71, x41);
+  { uint32_t x103 = cmovznz32(x102, x98, x68);
+  { uint32_t x104 = cmovznz32(x102, x95, x65);
+  { uint32_t x105 = cmovznz32(x102, x92, x62);
+  { uint32_t x106 = cmovznz32(x102, x89, x59);
+  { uint32_t x107 = cmovznz32(x102, x86, x56);
+  { uint32_t x108 = cmovznz32(x102, x83, x53);
+  { uint32_t x109 = cmovznz32(x102, x80, x50);
+  { uint32_t x110 = cmovznz32(x102, x77, x47);
+  { uint32_t x111 = cmovznz32(x102, x74, x44);
+  { uint32_t x112 = cmovznz32(x102, x71, x41);
   out[0] = x112;
   out[1] = x111;
   out[2] = x110;
diff --git a/src/Specific/montgomery32_2e291m19/feaddDisplay.log b/src/Specific/montgomery32_2e291m19/feaddDisplay.log
index 48ac77299..6b530ebf5 100644
--- a/src/Specific/montgomery32_2e291m19/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e291m19/feaddDisplay.log
@@ -23,16 +23,16 @@ Interp-η
  uint32_t x95, uint8_t x96 = subborrow_u32(x93, x65, 0xffffffff);
  uint32_t x98, uint8_t x99 = subborrow_u32(x96, x68, 0x7);
  uint32_t _, uint8_t x102 = subborrow_u32(x99, x69, 0x0);
- uint32_t x103 = cmovznz(x102, x98, x68);
- uint32_t x104 = cmovznz(x102, x95, x65);
- uint32_t x105 = cmovznz(x102, x92, x62);
- uint32_t x106 = cmovznz(x102, x89, x59);
- uint32_t x107 = cmovznz(x102, x86, x56);
- uint32_t x108 = cmovznz(x102, x83, x53);
- uint32_t x109 = cmovznz(x102, x80, x50);
- uint32_t x110 = cmovznz(x102, x77, x47);
- uint32_t x111 = cmovznz(x102, x74, x44);
- uint32_t x112 = cmovznz(x102, x71, x41);
+ uint32_t x103 = cmovznz32(x102, x98, x68);
+ uint32_t x104 = cmovznz32(x102, x95, x65);
+ uint32_t x105 = cmovznz32(x102, x92, x62);
+ uint32_t x106 = cmovznz32(x102, x89, x59);
+ uint32_t x107 = cmovznz32(x102, x86, x56);
+ uint32_t x108 = cmovznz32(x102, x83, x53);
+ uint32_t x109 = cmovznz32(x102, x80, x50);
+ uint32_t x110 = cmovznz32(x102, x77, x47);
+ uint32_t x111 = cmovznz32(x102, x74, x44);
+ uint32_t x112 = cmovznz32(x102, x71, x41);
  return (x103, x104, x105, x106, x107, x108, x109, x110, x111, x112))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e321m9/feadd.c b/src/Specific/montgomery32_2e321m9/feadd.c
index 3ff7adea9..c637bcba9 100644
--- a/src/Specific/montgomery32_2e321m9/feadd.c
+++ b/src/Specific/montgomery32_2e321m9/feadd.c
@@ -44,17 +44,17 @@ static void feadd(uint32_t out[11], const uint32_t in1[11], const uint32_t in2[1
   { uint32_t x105; uint8_t x106 = _subborrow_u32(x103, x72, 0xffffffff, &x105);
   { uint32_t x108; uint8_t x109 = _subborrow_u32(x106, x75, 0x1, &x108);
   { uint32_t _; uint8_t x112 = _subborrow_u32(x109, x76, 0x0, &_);
-  { uint32_t x113 = cmovznz(x112, x108, x75);
-  { uint32_t x114 = cmovznz(x112, x105, x72);
-  { uint32_t x115 = cmovznz(x112, x102, x69);
-  { uint32_t x116 = cmovznz(x112, x99, x66);
-  { uint32_t x117 = cmovznz(x112, x96, x63);
-  { uint32_t x118 = cmovznz(x112, x93, x60);
-  { uint32_t x119 = cmovznz(x112, x90, x57);
-  { uint32_t x120 = cmovznz(x112, x87, x54);
-  { uint32_t x121 = cmovznz(x112, x84, x51);
-  { uint32_t x122 = cmovznz(x112, x81, x48);
-  { uint32_t x123 = cmovznz(x112, x78, x45);
+  { uint32_t x113 = cmovznz32(x112, x108, x75);
+  { uint32_t x114 = cmovznz32(x112, x105, x72);
+  { uint32_t x115 = cmovznz32(x112, x102, x69);
+  { uint32_t x116 = cmovznz32(x112, x99, x66);
+  { uint32_t x117 = cmovznz32(x112, x96, x63);
+  { uint32_t x118 = cmovznz32(x112, x93, x60);
+  { uint32_t x119 = cmovznz32(x112, x90, x57);
+  { uint32_t x120 = cmovznz32(x112, x87, x54);
+  { uint32_t x121 = cmovznz32(x112, x84, x51);
+  { uint32_t x122 = cmovznz32(x112, x81, x48);
+  { uint32_t x123 = cmovznz32(x112, x78, x45);
   out[0] = x123;
   out[1] = x122;
   out[2] = x121;
diff --git a/src/Specific/montgomery32_2e321m9/feaddDisplay.log b/src/Specific/montgomery32_2e321m9/feaddDisplay.log
index e2dd707dc..3f005e69e 100644
--- a/src/Specific/montgomery32_2e321m9/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e321m9/feaddDisplay.log
@@ -25,17 +25,17 @@ Interp-η
  uint32_t x105, uint8_t x106 = subborrow_u32(x103, x72, 0xffffffff);
  uint32_t x108, uint8_t x109 = subborrow_u32(x106, x75, 0x1);
  uint32_t _, uint8_t x112 = subborrow_u32(x109, x76, 0x0);
- uint32_t x113 = cmovznz(x112, x108, x75);
- uint32_t x114 = cmovznz(x112, x105, x72);
- uint32_t x115 = cmovznz(x112, x102, x69);
- uint32_t x116 = cmovznz(x112, x99, x66);
- uint32_t x117 = cmovznz(x112, x96, x63);
- uint32_t x118 = cmovznz(x112, x93, x60);
- uint32_t x119 = cmovznz(x112, x90, x57);
- uint32_t x120 = cmovznz(x112, x87, x54);
- uint32_t x121 = cmovznz(x112, x84, x51);
- uint32_t x122 = cmovznz(x112, x81, x48);
- uint32_t x123 = cmovznz(x112, x78, x45);
+ uint32_t x113 = cmovznz32(x112, x108, x75);
+ uint32_t x114 = cmovznz32(x112, x105, x72);
+ uint32_t x115 = cmovznz32(x112, x102, x69);
+ uint32_t x116 = cmovznz32(x112, x99, x66);
+ uint32_t x117 = cmovznz32(x112, x96, x63);
+ uint32_t x118 = cmovznz32(x112, x93, x60);
+ uint32_t x119 = cmovznz32(x112, x90, x57);
+ uint32_t x120 = cmovznz32(x112, x87, x54);
+ uint32_t x121 = cmovznz32(x112, x84, x51);
+ uint32_t x122 = cmovznz32(x112, x81, x48);
+ uint32_t x123 = cmovznz32(x112, x78, x45);
  return (x113, x114, x115, x116, x117, x118, x119, x120, x121, x122, x123))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e322m2e161m1/feadd.c b/src/Specific/montgomery32_2e322m2e161m1/feadd.c
index 13bacf203..60f7eb069 100644
--- a/src/Specific/montgomery32_2e322m2e161m1/feadd.c
+++ b/src/Specific/montgomery32_2e322m2e161m1/feadd.c
@@ -44,17 +44,17 @@ static void feadd(uint32_t out[11], const uint32_t in1[11], const uint32_t in2[1
   { uint32_t x105; uint8_t x106 = _subborrow_u32(x103, x72, 0xffffffff, &x105);
   { uint32_t x108; uint8_t x109 = _subborrow_u32(x106, x75, 0x3, &x108);
   { uint32_t _; uint8_t x112 = _subborrow_u32(x109, x76, 0x0, &_);
-  { uint32_t x113 = cmovznz(x112, x108, x75);
-  { uint32_t x114 = cmovznz(x112, x105, x72);
-  { uint32_t x115 = cmovznz(x112, x102, x69);
-  { uint32_t x116 = cmovznz(x112, x99, x66);
-  { uint32_t x117 = cmovznz(x112, x96, x63);
-  { uint32_t x118 = cmovznz(x112, x93, x60);
-  { uint32_t x119 = cmovznz(x112, x90, x57);
-  { uint32_t x120 = cmovznz(x112, x87, x54);
-  { uint32_t x121 = cmovznz(x112, x84, x51);
-  { uint32_t x122 = cmovznz(x112, x81, x48);
-  { uint32_t x123 = cmovznz(x112, x78, x45);
+  { uint32_t x113 = cmovznz32(x112, x108, x75);
+  { uint32_t x114 = cmovznz32(x112, x105, x72);
+  { uint32_t x115 = cmovznz32(x112, x102, x69);
+  { uint32_t x116 = cmovznz32(x112, x99, x66);
+  { uint32_t x117 = cmovznz32(x112, x96, x63);
+  { uint32_t x118 = cmovznz32(x112, x93, x60);
+  { uint32_t x119 = cmovznz32(x112, x90, x57);
+  { uint32_t x120 = cmovznz32(x112, x87, x54);
+  { uint32_t x121 = cmovznz32(x112, x84, x51);
+  { uint32_t x122 = cmovznz32(x112, x81, x48);
+  { uint32_t x123 = cmovznz32(x112, x78, x45);
   out[0] = x123;
   out[1] = x122;
   out[2] = x121;
diff --git a/src/Specific/montgomery32_2e322m2e161m1/feaddDisplay.log b/src/Specific/montgomery32_2e322m2e161m1/feaddDisplay.log
index 416108c0f..4aa00c707 100644
--- a/src/Specific/montgomery32_2e322m2e161m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e322m2e161m1/feaddDisplay.log
@@ -25,17 +25,17 @@ Interp-η
  uint32_t x105, uint8_t x106 = subborrow_u32(x103, x72, 0xffffffff);
  uint32_t x108, uint8_t x109 = subborrow_u32(x106, x75, 0x3);
  uint32_t _, uint8_t x112 = subborrow_u32(x109, x76, 0x0);
- uint32_t x113 = cmovznz(x112, x108, x75);
- uint32_t x114 = cmovznz(x112, x105, x72);
- uint32_t x115 = cmovznz(x112, x102, x69);
- uint32_t x116 = cmovznz(x112, x99, x66);
- uint32_t x117 = cmovznz(x112, x96, x63);
- uint32_t x118 = cmovznz(x112, x93, x60);
- uint32_t x119 = cmovznz(x112, x90, x57);
- uint32_t x120 = cmovznz(x112, x87, x54);
- uint32_t x121 = cmovznz(x112, x84, x51);
- uint32_t x122 = cmovznz(x112, x81, x48);
- uint32_t x123 = cmovznz(x112, x78, x45);
+ uint32_t x113 = cmovznz32(x112, x108, x75);
+ uint32_t x114 = cmovznz32(x112, x105, x72);
+ uint32_t x115 = cmovznz32(x112, x102, x69);
+ uint32_t x116 = cmovznz32(x112, x99, x66);
+ uint32_t x117 = cmovznz32(x112, x96, x63);
+ uint32_t x118 = cmovznz32(x112, x93, x60);
+ uint32_t x119 = cmovznz32(x112, x90, x57);
+ uint32_t x120 = cmovznz32(x112, x87, x54);
+ uint32_t x121 = cmovznz32(x112, x84, x51);
+ uint32_t x122 = cmovznz32(x112, x81, x48);
+ uint32_t x123 = cmovznz32(x112, x78, x45);
  return (x113, x114, x115, x116, x117, x118, x119, x120, x121, x122, x123))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e336m17/feadd.c b/src/Specific/montgomery32_2e336m17/feadd.c
index 73f8dedff..c5dd7f807 100644
--- a/src/Specific/montgomery32_2e336m17/feadd.c
+++ b/src/Specific/montgomery32_2e336m17/feadd.c
@@ -44,17 +44,17 @@ static void feadd(uint32_t out[11], const uint32_t in1[11], const uint32_t in2[1
   { uint32_t x105; uint8_t x106 = _subborrow_u32(x103, x72, 0xffffffff, &x105);
   { uint32_t x108; uint8_t x109 = _subborrow_u32(x106, x75, 0xffff, &x108);
   { uint32_t _; uint8_t x112 = _subborrow_u32(x109, x76, 0x0, &_);
-  { uint32_t x113 = cmovznz(x112, x108, x75);
-  { uint32_t x114 = cmovznz(x112, x105, x72);
-  { uint32_t x115 = cmovznz(x112, x102, x69);
-  { uint32_t x116 = cmovznz(x112, x99, x66);
-  { uint32_t x117 = cmovznz(x112, x96, x63);
-  { uint32_t x118 = cmovznz(x112, x93, x60);
-  { uint32_t x119 = cmovznz(x112, x90, x57);
-  { uint32_t x120 = cmovznz(x112, x87, x54);
-  { uint32_t x121 = cmovznz(x112, x84, x51);
-  { uint32_t x122 = cmovznz(x112, x81, x48);
-  { uint32_t x123 = cmovznz(x112, x78, x45);
+  { uint32_t x113 = cmovznz32(x112, x108, x75);
+  { uint32_t x114 = cmovznz32(x112, x105, x72);
+  { uint32_t x115 = cmovznz32(x112, x102, x69);
+  { uint32_t x116 = cmovznz32(x112, x99, x66);
+  { uint32_t x117 = cmovznz32(x112, x96, x63);
+  { uint32_t x118 = cmovznz32(x112, x93, x60);
+  { uint32_t x119 = cmovznz32(x112, x90, x57);
+  { uint32_t x120 = cmovznz32(x112, x87, x54);
+  { uint32_t x121 = cmovznz32(x112, x84, x51);
+  { uint32_t x122 = cmovznz32(x112, x81, x48);
+  { uint32_t x123 = cmovznz32(x112, x78, x45);
   out[0] = x123;
   out[1] = x122;
   out[2] = x121;
diff --git a/src/Specific/montgomery32_2e336m17/feaddDisplay.log b/src/Specific/montgomery32_2e336m17/feaddDisplay.log
index 2319d006e..09fdf8d10 100644
--- a/src/Specific/montgomery32_2e336m17/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e336m17/feaddDisplay.log
@@ -25,17 +25,17 @@ Interp-η
  uint32_t x105, uint8_t x106 = subborrow_u32(x103, x72, 0xffffffff);
  uint32_t x108, uint8_t x109 = subborrow_u32(x106, x75, 0xffff);
  uint32_t _, uint8_t x112 = subborrow_u32(x109, x76, 0x0);
- uint32_t x113 = cmovznz(x112, x108, x75);
- uint32_t x114 = cmovznz(x112, x105, x72);
- uint32_t x115 = cmovznz(x112, x102, x69);
- uint32_t x116 = cmovznz(x112, x99, x66);
- uint32_t x117 = cmovznz(x112, x96, x63);
- uint32_t x118 = cmovznz(x112, x93, x60);
- uint32_t x119 = cmovznz(x112, x90, x57);
- uint32_t x120 = cmovznz(x112, x87, x54);
- uint32_t x121 = cmovznz(x112, x84, x51);
- uint32_t x122 = cmovznz(x112, x81, x48);
- uint32_t x123 = cmovznz(x112, x78, x45);
+ uint32_t x113 = cmovznz32(x112, x108, x75);
+ uint32_t x114 = cmovznz32(x112, x105, x72);
+ uint32_t x115 = cmovznz32(x112, x102, x69);
+ uint32_t x116 = cmovznz32(x112, x99, x66);
+ uint32_t x117 = cmovznz32(x112, x96, x63);
+ uint32_t x118 = cmovznz32(x112, x93, x60);
+ uint32_t x119 = cmovznz32(x112, x90, x57);
+ uint32_t x120 = cmovznz32(x112, x87, x54);
+ uint32_t x121 = cmovznz32(x112, x84, x51);
+ uint32_t x122 = cmovznz32(x112, x81, x48);
+ uint32_t x123 = cmovznz32(x112, x78, x45);
  return (x113, x114, x115, x116, x117, x118, x119, x120, x121, x122, x123))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e336m3/feadd.c b/src/Specific/montgomery32_2e336m3/feadd.c
index 97458a3b9..d78f51b80 100644
--- a/src/Specific/montgomery32_2e336m3/feadd.c
+++ b/src/Specific/montgomery32_2e336m3/feadd.c
@@ -44,17 +44,17 @@ static void feadd(uint32_t out[11], const uint32_t in1[11], const uint32_t in2[1
   { uint32_t x105; uint8_t x106 = _subborrow_u32(x103, x72, 0xffffffff, &x105);
   { uint32_t x108; uint8_t x109 = _subborrow_u32(x106, x75, 0xffff, &x108);
   { uint32_t _; uint8_t x112 = _subborrow_u32(x109, x76, 0x0, &_);
-  { uint32_t x113 = cmovznz(x112, x108, x75);
-  { uint32_t x114 = cmovznz(x112, x105, x72);
-  { uint32_t x115 = cmovznz(x112, x102, x69);
-  { uint32_t x116 = cmovznz(x112, x99, x66);
-  { uint32_t x117 = cmovznz(x112, x96, x63);
-  { uint32_t x118 = cmovznz(x112, x93, x60);
-  { uint32_t x119 = cmovznz(x112, x90, x57);
-  { uint32_t x120 = cmovznz(x112, x87, x54);
-  { uint32_t x121 = cmovznz(x112, x84, x51);
-  { uint32_t x122 = cmovznz(x112, x81, x48);
-  { uint32_t x123 = cmovznz(x112, x78, x45);
+  { uint32_t x113 = cmovznz32(x112, x108, x75);
+  { uint32_t x114 = cmovznz32(x112, x105, x72);
+  { uint32_t x115 = cmovznz32(x112, x102, x69);
+  { uint32_t x116 = cmovznz32(x112, x99, x66);
+  { uint32_t x117 = cmovznz32(x112, x96, x63);
+  { uint32_t x118 = cmovznz32(x112, x93, x60);
+  { uint32_t x119 = cmovznz32(x112, x90, x57);
+  { uint32_t x120 = cmovznz32(x112, x87, x54);
+  { uint32_t x121 = cmovznz32(x112, x84, x51);
+  { uint32_t x122 = cmovznz32(x112, x81, x48);
+  { uint32_t x123 = cmovznz32(x112, x78, x45);
   out[0] = x123;
   out[1] = x122;
   out[2] = x121;
diff --git a/src/Specific/montgomery32_2e336m3/feaddDisplay.log b/src/Specific/montgomery32_2e336m3/feaddDisplay.log
index 923194aff..fffeb4702 100644
--- a/src/Specific/montgomery32_2e336m3/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e336m3/feaddDisplay.log
@@ -25,17 +25,17 @@ Interp-η
  uint32_t x105, uint8_t x106 = subborrow_u32(x103, x72, 0xffffffff);
  uint32_t x108, uint8_t x109 = subborrow_u32(x106, x75, 0xffff);
  uint32_t _, uint8_t x112 = subborrow_u32(x109, x76, 0x0);
- uint32_t x113 = cmovznz(x112, x108, x75);
- uint32_t x114 = cmovznz(x112, x105, x72);
- uint32_t x115 = cmovznz(x112, x102, x69);
- uint32_t x116 = cmovznz(x112, x99, x66);
- uint32_t x117 = cmovznz(x112, x96, x63);
- uint32_t x118 = cmovznz(x112, x93, x60);
- uint32_t x119 = cmovznz(x112, x90, x57);
- uint32_t x120 = cmovznz(x112, x87, x54);
- uint32_t x121 = cmovznz(x112, x84, x51);
- uint32_t x122 = cmovznz(x112, x81, x48);
- uint32_t x123 = cmovznz(x112, x78, x45);
+ uint32_t x113 = cmovznz32(x112, x108, x75);
+ uint32_t x114 = cmovznz32(x112, x105, x72);
+ uint32_t x115 = cmovznz32(x112, x102, x69);
+ uint32_t x116 = cmovznz32(x112, x99, x66);
+ uint32_t x117 = cmovznz32(x112, x96, x63);
+ uint32_t x118 = cmovznz32(x112, x93, x60);
+ uint32_t x119 = cmovznz32(x112, x90, x57);
+ uint32_t x120 = cmovznz32(x112, x87, x54);
+ uint32_t x121 = cmovznz32(x112, x84, x51);
+ uint32_t x122 = cmovznz32(x112, x81, x48);
+ uint32_t x123 = cmovznz32(x112, x78, x45);
  return (x113, x114, x115, x116, x117, x118, x119, x120, x121, x122, x123))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e338m15/feadd.c b/src/Specific/montgomery32_2e338m15/feadd.c
index e50596dff..7883f5102 100644
--- a/src/Specific/montgomery32_2e338m15/feadd.c
+++ b/src/Specific/montgomery32_2e338m15/feadd.c
@@ -44,17 +44,17 @@ static void feadd(uint32_t out[11], const uint32_t in1[11], const uint32_t in2[1
   { uint32_t x105; uint8_t x106 = _subborrow_u32(x103, x72, 0xffffffff, &x105);
   { uint32_t x108; uint8_t x109 = _subborrow_u32(x106, x75, 0x3ffff, &x108);
   { uint32_t _; uint8_t x112 = _subborrow_u32(x109, x76, 0x0, &_);
-  { uint32_t x113 = cmovznz(x112, x108, x75);
-  { uint32_t x114 = cmovznz(x112, x105, x72);
-  { uint32_t x115 = cmovznz(x112, x102, x69);
-  { uint32_t x116 = cmovznz(x112, x99, x66);
-  { uint32_t x117 = cmovznz(x112, x96, x63);
-  { uint32_t x118 = cmovznz(x112, x93, x60);
-  { uint32_t x119 = cmovznz(x112, x90, x57);
-  { uint32_t x120 = cmovznz(x112, x87, x54);
-  { uint32_t x121 = cmovznz(x112, x84, x51);
-  { uint32_t x122 = cmovznz(x112, x81, x48);
-  { uint32_t x123 = cmovznz(x112, x78, x45);
+  { uint32_t x113 = cmovznz32(x112, x108, x75);
+  { uint32_t x114 = cmovznz32(x112, x105, x72);
+  { uint32_t x115 = cmovznz32(x112, x102, x69);
+  { uint32_t x116 = cmovznz32(x112, x99, x66);
+  { uint32_t x117 = cmovznz32(x112, x96, x63);
+  { uint32_t x118 = cmovznz32(x112, x93, x60);
+  { uint32_t x119 = cmovznz32(x112, x90, x57);
+  { uint32_t x120 = cmovznz32(x112, x87, x54);
+  { uint32_t x121 = cmovznz32(x112, x84, x51);
+  { uint32_t x122 = cmovznz32(x112, x81, x48);
+  { uint32_t x123 = cmovznz32(x112, x78, x45);
   out[0] = x123;
   out[1] = x122;
   out[2] = x121;
diff --git a/src/Specific/montgomery32_2e338m15/feaddDisplay.log b/src/Specific/montgomery32_2e338m15/feaddDisplay.log
index 16f42a0e8..0c5d2c998 100644
--- a/src/Specific/montgomery32_2e338m15/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e338m15/feaddDisplay.log
@@ -25,17 +25,17 @@ Interp-η
  uint32_t x105, uint8_t x106 = subborrow_u32(x103, x72, 0xffffffff);
  uint32_t x108, uint8_t x109 = subborrow_u32(x106, x75, 0x3ffff);
  uint32_t _, uint8_t x112 = subborrow_u32(x109, x76, 0x0);
- uint32_t x113 = cmovznz(x112, x108, x75);
- uint32_t x114 = cmovznz(x112, x105, x72);
- uint32_t x115 = cmovznz(x112, x102, x69);
- uint32_t x116 = cmovznz(x112, x99, x66);
- uint32_t x117 = cmovznz(x112, x96, x63);
- uint32_t x118 = cmovznz(x112, x93, x60);
- uint32_t x119 = cmovznz(x112, x90, x57);
- uint32_t x120 = cmovznz(x112, x87, x54);
- uint32_t x121 = cmovznz(x112, x84, x51);
- uint32_t x122 = cmovznz(x112, x81, x48);
- uint32_t x123 = cmovznz(x112, x78, x45);
+ uint32_t x113 = cmovznz32(x112, x108, x75);
+ uint32_t x114 = cmovznz32(x112, x105, x72);
+ uint32_t x115 = cmovznz32(x112, x102, x69);
+ uint32_t x116 = cmovznz32(x112, x99, x66);
+ uint32_t x117 = cmovznz32(x112, x96, x63);
+ uint32_t x118 = cmovznz32(x112, x93, x60);
+ uint32_t x119 = cmovznz32(x112, x90, x57);
+ uint32_t x120 = cmovznz32(x112, x87, x54);
+ uint32_t x121 = cmovznz32(x112, x84, x51);
+ uint32_t x122 = cmovznz32(x112, x81, x48);
+ uint32_t x123 = cmovznz32(x112, x78, x45);
  return (x113, x114, x115, x116, x117, x118, x119, x120, x121, x122, x123))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e369m25/feadd.c b/src/Specific/montgomery32_2e369m25/feadd.c
index 00c28d2ea..36dd32b7d 100644
--- a/src/Specific/montgomery32_2e369m25/feadd.c
+++ b/src/Specific/montgomery32_2e369m25/feadd.c
@@ -48,18 +48,18 @@ static void feadd(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[1
   { uint32_t x115; uint8_t x116 = _subborrow_u32(x113, x79, 0xffffffff, &x115);
   { uint32_t x118; uint8_t x119 = _subborrow_u32(x116, x82, 0x1ffff, &x118);
   { uint32_t _; uint8_t x122 = _subborrow_u32(x119, x83, 0x0, &_);
-  { uint32_t x123 = cmovznz(x122, x118, x82);
-  { uint32_t x124 = cmovznz(x122, x115, x79);
-  { uint32_t x125 = cmovznz(x122, x112, x76);
-  { uint32_t x126 = cmovznz(x122, x109, x73);
-  { uint32_t x127 = cmovznz(x122, x106, x70);
-  { uint32_t x128 = cmovznz(x122, x103, x67);
-  { uint32_t x129 = cmovznz(x122, x100, x64);
-  { uint32_t x130 = cmovznz(x122, x97, x61);
-  { uint32_t x131 = cmovznz(x122, x94, x58);
-  { uint32_t x132 = cmovznz(x122, x91, x55);
-  { uint32_t x133 = cmovznz(x122, x88, x52);
-  { uint32_t x134 = cmovznz(x122, x85, x49);
+  { uint32_t x123 = cmovznz32(x122, x118, x82);
+  { uint32_t x124 = cmovznz32(x122, x115, x79);
+  { uint32_t x125 = cmovznz32(x122, x112, x76);
+  { uint32_t x126 = cmovznz32(x122, x109, x73);
+  { uint32_t x127 = cmovznz32(x122, x106, x70);
+  { uint32_t x128 = cmovznz32(x122, x103, x67);
+  { uint32_t x129 = cmovznz32(x122, x100, x64);
+  { uint32_t x130 = cmovznz32(x122, x97, x61);
+  { uint32_t x131 = cmovznz32(x122, x94, x58);
+  { uint32_t x132 = cmovznz32(x122, x91, x55);
+  { uint32_t x133 = cmovznz32(x122, x88, x52);
+  { uint32_t x134 = cmovznz32(x122, x85, x49);
   out[0] = x134;
   out[1] = x133;
   out[2] = x132;
diff --git a/src/Specific/montgomery32_2e369m25/feaddDisplay.log b/src/Specific/montgomery32_2e369m25/feaddDisplay.log
index ef7da1f66..16fda009a 100644
--- a/src/Specific/montgomery32_2e369m25/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e369m25/feaddDisplay.log
@@ -27,18 +27,18 @@ Interp-η
  uint32_t x115, uint8_t x116 = subborrow_u32(x113, x79, 0xffffffff);
  uint32_t x118, uint8_t x119 = subborrow_u32(x116, x82, 0x1ffff);
  uint32_t _, uint8_t x122 = subborrow_u32(x119, x83, 0x0);
- uint32_t x123 = cmovznz(x122, x118, x82);
- uint32_t x124 = cmovznz(x122, x115, x79);
- uint32_t x125 = cmovznz(x122, x112, x76);
- uint32_t x126 = cmovznz(x122, x109, x73);
- uint32_t x127 = cmovznz(x122, x106, x70);
- uint32_t x128 = cmovznz(x122, x103, x67);
- uint32_t x129 = cmovznz(x122, x100, x64);
- uint32_t x130 = cmovznz(x122, x97, x61);
- uint32_t x131 = cmovznz(x122, x94, x58);
- uint32_t x132 = cmovznz(x122, x91, x55);
- uint32_t x133 = cmovznz(x122, x88, x52);
- uint32_t x134 = cmovznz(x122, x85, x49);
+ uint32_t x123 = cmovznz32(x122, x118, x82);
+ uint32_t x124 = cmovznz32(x122, x115, x79);
+ uint32_t x125 = cmovznz32(x122, x112, x76);
+ uint32_t x126 = cmovznz32(x122, x109, x73);
+ uint32_t x127 = cmovznz32(x122, x106, x70);
+ uint32_t x128 = cmovznz32(x122, x103, x67);
+ uint32_t x129 = cmovznz32(x122, x100, x64);
+ uint32_t x130 = cmovznz32(x122, x97, x61);
+ uint32_t x131 = cmovznz32(x122, x94, x58);
+ uint32_t x132 = cmovznz32(x122, x91, x55);
+ uint32_t x133 = cmovznz32(x122, x88, x52);
+ uint32_t x134 = cmovznz32(x122, x85, x49);
  return (x123, x124, x125, x126, x127, x128, x129, x130, x131, x132, x133, x134))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e379m19/feadd.c b/src/Specific/montgomery32_2e379m19/feadd.c
index 985e02577..2add72b03 100644
--- a/src/Specific/montgomery32_2e379m19/feadd.c
+++ b/src/Specific/montgomery32_2e379m19/feadd.c
@@ -48,18 +48,18 @@ static void feadd(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[1
   { uint32_t x115; uint8_t x116 = _subborrow_u32(x113, x79, 0xffffffff, &x115);
   { uint32_t x118; uint8_t x119 = _subborrow_u32(x116, x82, 0x7ffffff, &x118);
   { uint32_t _; uint8_t x122 = _subborrow_u32(x119, x83, 0x0, &_);
-  { uint32_t x123 = cmovznz(x122, x118, x82);
-  { uint32_t x124 = cmovznz(x122, x115, x79);
-  { uint32_t x125 = cmovznz(x122, x112, x76);
-  { uint32_t x126 = cmovznz(x122, x109, x73);
-  { uint32_t x127 = cmovznz(x122, x106, x70);
-  { uint32_t x128 = cmovznz(x122, x103, x67);
-  { uint32_t x129 = cmovznz(x122, x100, x64);
-  { uint32_t x130 = cmovznz(x122, x97, x61);
-  { uint32_t x131 = cmovznz(x122, x94, x58);
-  { uint32_t x132 = cmovznz(x122, x91, x55);
-  { uint32_t x133 = cmovznz(x122, x88, x52);
-  { uint32_t x134 = cmovznz(x122, x85, x49);
+  { uint32_t x123 = cmovznz32(x122, x118, x82);
+  { uint32_t x124 = cmovznz32(x122, x115, x79);
+  { uint32_t x125 = cmovznz32(x122, x112, x76);
+  { uint32_t x126 = cmovznz32(x122, x109, x73);
+  { uint32_t x127 = cmovznz32(x122, x106, x70);
+  { uint32_t x128 = cmovznz32(x122, x103, x67);
+  { uint32_t x129 = cmovznz32(x122, x100, x64);
+  { uint32_t x130 = cmovznz32(x122, x97, x61);
+  { uint32_t x131 = cmovznz32(x122, x94, x58);
+  { uint32_t x132 = cmovznz32(x122, x91, x55);
+  { uint32_t x133 = cmovznz32(x122, x88, x52);
+  { uint32_t x134 = cmovznz32(x122, x85, x49);
   out[0] = x134;
   out[1] = x133;
   out[2] = x132;
diff --git a/src/Specific/montgomery32_2e379m19/feaddDisplay.log b/src/Specific/montgomery32_2e379m19/feaddDisplay.log
index 0f517ce42..48ec006e0 100644
--- a/src/Specific/montgomery32_2e379m19/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e379m19/feaddDisplay.log
@@ -27,18 +27,18 @@ Interp-η
  uint32_t x115, uint8_t x116 = subborrow_u32(x113, x79, 0xffffffff);
  uint32_t x118, uint8_t x119 = subborrow_u32(x116, x82, 0x7ffffff);
  uint32_t _, uint8_t x122 = subborrow_u32(x119, x83, 0x0);
- uint32_t x123 = cmovznz(x122, x118, x82);
- uint32_t x124 = cmovznz(x122, x115, x79);
- uint32_t x125 = cmovznz(x122, x112, x76);
- uint32_t x126 = cmovznz(x122, x109, x73);
- uint32_t x127 = cmovznz(x122, x106, x70);
- uint32_t x128 = cmovznz(x122, x103, x67);
- uint32_t x129 = cmovznz(x122, x100, x64);
- uint32_t x130 = cmovznz(x122, x97, x61);
- uint32_t x131 = cmovznz(x122, x94, x58);
- uint32_t x132 = cmovznz(x122, x91, x55);
- uint32_t x133 = cmovznz(x122, x88, x52);
- uint32_t x134 = cmovznz(x122, x85, x49);
+ uint32_t x123 = cmovznz32(x122, x118, x82);
+ uint32_t x124 = cmovznz32(x122, x115, x79);
+ uint32_t x125 = cmovznz32(x122, x112, x76);
+ uint32_t x126 = cmovznz32(x122, x109, x73);
+ uint32_t x127 = cmovznz32(x122, x106, x70);
+ uint32_t x128 = cmovznz32(x122, x103, x67);
+ uint32_t x129 = cmovznz32(x122, x100, x64);
+ uint32_t x130 = cmovznz32(x122, x97, x61);
+ uint32_t x131 = cmovznz32(x122, x94, x58);
+ uint32_t x132 = cmovznz32(x122, x91, x55);
+ uint32_t x133 = cmovznz32(x122, x88, x52);
+ uint32_t x134 = cmovznz32(x122, x85, x49);
  return (x123, x124, x125, x126, x127, x128, x129, x130, x131, x132, x133, x134))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e382m105/feadd.c b/src/Specific/montgomery32_2e382m105/feadd.c
index fef83b2bc..91d56558c 100644
--- a/src/Specific/montgomery32_2e382m105/feadd.c
+++ b/src/Specific/montgomery32_2e382m105/feadd.c
@@ -48,18 +48,18 @@ static void feadd(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[1
   { uint32_t x115; uint8_t x116 = _subborrow_u32(x113, x79, 0xffffffff, &x115);
   { uint32_t x118; uint8_t x119 = _subborrow_u32(x116, x82, 0x3fffffff, &x118);
   { uint32_t _; uint8_t x122 = _subborrow_u32(x119, x83, 0x0, &_);
-  { uint32_t x123 = cmovznz(x122, x118, x82);
-  { uint32_t x124 = cmovznz(x122, x115, x79);
-  { uint32_t x125 = cmovznz(x122, x112, x76);
-  { uint32_t x126 = cmovznz(x122, x109, x73);
-  { uint32_t x127 = cmovznz(x122, x106, x70);
-  { uint32_t x128 = cmovznz(x122, x103, x67);
-  { uint32_t x129 = cmovznz(x122, x100, x64);
-  { uint32_t x130 = cmovznz(x122, x97, x61);
-  { uint32_t x131 = cmovznz(x122, x94, x58);
-  { uint32_t x132 = cmovznz(x122, x91, x55);
-  { uint32_t x133 = cmovznz(x122, x88, x52);
-  { uint32_t x134 = cmovznz(x122, x85, x49);
+  { uint32_t x123 = cmovznz32(x122, x118, x82);
+  { uint32_t x124 = cmovznz32(x122, x115, x79);
+  { uint32_t x125 = cmovznz32(x122, x112, x76);
+  { uint32_t x126 = cmovznz32(x122, x109, x73);
+  { uint32_t x127 = cmovznz32(x122, x106, x70);
+  { uint32_t x128 = cmovznz32(x122, x103, x67);
+  { uint32_t x129 = cmovznz32(x122, x100, x64);
+  { uint32_t x130 = cmovznz32(x122, x97, x61);
+  { uint32_t x131 = cmovznz32(x122, x94, x58);
+  { uint32_t x132 = cmovznz32(x122, x91, x55);
+  { uint32_t x133 = cmovznz32(x122, x88, x52);
+  { uint32_t x134 = cmovznz32(x122, x85, x49);
   out[0] = x134;
   out[1] = x133;
   out[2] = x132;
diff --git a/src/Specific/montgomery32_2e382m105/feaddDisplay.log b/src/Specific/montgomery32_2e382m105/feaddDisplay.log
index 640835bc3..1d5b08b0e 100644
--- a/src/Specific/montgomery32_2e382m105/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e382m105/feaddDisplay.log
@@ -27,18 +27,18 @@ Interp-η
  uint32_t x115, uint8_t x116 = subborrow_u32(x113, x79, 0xffffffff);
  uint32_t x118, uint8_t x119 = subborrow_u32(x116, x82, 0x3fffffff);
  uint32_t _, uint8_t x122 = subborrow_u32(x119, x83, 0x0);
- uint32_t x123 = cmovznz(x122, x118, x82);
- uint32_t x124 = cmovznz(x122, x115, x79);
- uint32_t x125 = cmovznz(x122, x112, x76);
- uint32_t x126 = cmovznz(x122, x109, x73);
- uint32_t x127 = cmovznz(x122, x106, x70);
- uint32_t x128 = cmovznz(x122, x103, x67);
- uint32_t x129 = cmovznz(x122, x100, x64);
- uint32_t x130 = cmovznz(x122, x97, x61);
- uint32_t x131 = cmovznz(x122, x94, x58);
- uint32_t x132 = cmovznz(x122, x91, x55);
- uint32_t x133 = cmovznz(x122, x88, x52);
- uint32_t x134 = cmovznz(x122, x85, x49);
+ uint32_t x123 = cmovznz32(x122, x118, x82);
+ uint32_t x124 = cmovznz32(x122, x115, x79);
+ uint32_t x125 = cmovznz32(x122, x112, x76);
+ uint32_t x126 = cmovznz32(x122, x109, x73);
+ uint32_t x127 = cmovznz32(x122, x106, x70);
+ uint32_t x128 = cmovznz32(x122, x103, x67);
+ uint32_t x129 = cmovznz32(x122, x100, x64);
+ uint32_t x130 = cmovznz32(x122, x97, x61);
+ uint32_t x131 = cmovznz32(x122, x94, x58);
+ uint32_t x132 = cmovznz32(x122, x91, x55);
+ uint32_t x133 = cmovznz32(x122, x88, x52);
+ uint32_t x134 = cmovznz32(x122, x85, x49);
  return (x123, x124, x125, x126, x127, x128, x129, x130, x131, x132, x133, x134))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e383m187/feadd.c b/src/Specific/montgomery32_2e383m187/feadd.c
index 6af8e69b1..8bd80a3bf 100644
--- a/src/Specific/montgomery32_2e383m187/feadd.c
+++ b/src/Specific/montgomery32_2e383m187/feadd.c
@@ -48,18 +48,18 @@ static void feadd(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[1
   { uint32_t x115; uint8_t x116 = _subborrow_u32(x113, x79, 0xffffffff, &x115);
   { uint32_t x118; uint8_t x119 = _subborrow_u32(x116, x82, 0x7fffffff, &x118);
   { uint32_t _; uint8_t x122 = _subborrow_u32(x119, x83, 0x0, &_);
-  { uint32_t x123 = cmovznz(x122, x118, x82);
-  { uint32_t x124 = cmovznz(x122, x115, x79);
-  { uint32_t x125 = cmovznz(x122, x112, x76);
-  { uint32_t x126 = cmovznz(x122, x109, x73);
-  { uint32_t x127 = cmovznz(x122, x106, x70);
-  { uint32_t x128 = cmovznz(x122, x103, x67);
-  { uint32_t x129 = cmovznz(x122, x100, x64);
-  { uint32_t x130 = cmovznz(x122, x97, x61);
-  { uint32_t x131 = cmovznz(x122, x94, x58);
-  { uint32_t x132 = cmovznz(x122, x91, x55);
-  { uint32_t x133 = cmovznz(x122, x88, x52);
-  { uint32_t x134 = cmovznz(x122, x85, x49);
+  { uint32_t x123 = cmovznz32(x122, x118, x82);
+  { uint32_t x124 = cmovznz32(x122, x115, x79);
+  { uint32_t x125 = cmovznz32(x122, x112, x76);
+  { uint32_t x126 = cmovznz32(x122, x109, x73);
+  { uint32_t x127 = cmovznz32(x122, x106, x70);
+  { uint32_t x128 = cmovznz32(x122, x103, x67);
+  { uint32_t x129 = cmovznz32(x122, x100, x64);
+  { uint32_t x130 = cmovznz32(x122, x97, x61);
+  { uint32_t x131 = cmovznz32(x122, x94, x58);
+  { uint32_t x132 = cmovznz32(x122, x91, x55);
+  { uint32_t x133 = cmovznz32(x122, x88, x52);
+  { uint32_t x134 = cmovznz32(x122, x85, x49);
   out[0] = x134;
   out[1] = x133;
   out[2] = x132;
diff --git a/src/Specific/montgomery32_2e383m187/feaddDisplay.log b/src/Specific/montgomery32_2e383m187/feaddDisplay.log
index 8cc89ef2d..b2077f6d1 100644
--- a/src/Specific/montgomery32_2e383m187/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e383m187/feaddDisplay.log
@@ -27,18 +27,18 @@ Interp-η
  uint32_t x115, uint8_t x116 = subborrow_u32(x113, x79, 0xffffffff);
  uint32_t x118, uint8_t x119 = subborrow_u32(x116, x82, 0x7fffffff);
  uint32_t _, uint8_t x122 = subborrow_u32(x119, x83, 0x0);
- uint32_t x123 = cmovznz(x122, x118, x82);
- uint32_t x124 = cmovznz(x122, x115, x79);
- uint32_t x125 = cmovznz(x122, x112, x76);
- uint32_t x126 = cmovznz(x122, x109, x73);
- uint32_t x127 = cmovznz(x122, x106, x70);
- uint32_t x128 = cmovznz(x122, x103, x67);
- uint32_t x129 = cmovznz(x122, x100, x64);
- uint32_t x130 = cmovznz(x122, x97, x61);
- uint32_t x131 = cmovznz(x122, x94, x58);
- uint32_t x132 = cmovznz(x122, x91, x55);
- uint32_t x133 = cmovznz(x122, x88, x52);
- uint32_t x134 = cmovznz(x122, x85, x49);
+ uint32_t x123 = cmovznz32(x122, x118, x82);
+ uint32_t x124 = cmovznz32(x122, x115, x79);
+ uint32_t x125 = cmovznz32(x122, x112, x76);
+ uint32_t x126 = cmovznz32(x122, x109, x73);
+ uint32_t x127 = cmovznz32(x122, x106, x70);
+ uint32_t x128 = cmovznz32(x122, x103, x67);
+ uint32_t x129 = cmovznz32(x122, x100, x64);
+ uint32_t x130 = cmovznz32(x122, x97, x61);
+ uint32_t x131 = cmovznz32(x122, x94, x58);
+ uint32_t x132 = cmovznz32(x122, x91, x55);
+ uint32_t x133 = cmovznz32(x122, x88, x52);
+ uint32_t x134 = cmovznz32(x122, x85, x49);
  return (x123, x124, x125, x126, x127, x128, x129, x130, x131, x132, x133, x134))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e383m31/feadd.c b/src/Specific/montgomery32_2e383m31/feadd.c
index 464a9aa36..9a542cca1 100644
--- a/src/Specific/montgomery32_2e383m31/feadd.c
+++ b/src/Specific/montgomery32_2e383m31/feadd.c
@@ -48,18 +48,18 @@ static void feadd(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[1
   { uint32_t x115; uint8_t x116 = _subborrow_u32(x113, x79, 0xffffffff, &x115);
   { uint32_t x118; uint8_t x119 = _subborrow_u32(x116, x82, 0x7fffffff, &x118);
   { uint32_t _; uint8_t x122 = _subborrow_u32(x119, x83, 0x0, &_);
-  { uint32_t x123 = cmovznz(x122, x118, x82);
-  { uint32_t x124 = cmovznz(x122, x115, x79);
-  { uint32_t x125 = cmovznz(x122, x112, x76);
-  { uint32_t x126 = cmovznz(x122, x109, x73);
-  { uint32_t x127 = cmovznz(x122, x106, x70);
-  { uint32_t x128 = cmovznz(x122, x103, x67);
-  { uint32_t x129 = cmovznz(x122, x100, x64);
-  { uint32_t x130 = cmovznz(x122, x97, x61);
-  { uint32_t x131 = cmovznz(x122, x94, x58);
-  { uint32_t x132 = cmovznz(x122, x91, x55);
-  { uint32_t x133 = cmovznz(x122, x88, x52);
-  { uint32_t x134 = cmovznz(x122, x85, x49);
+  { uint32_t x123 = cmovznz32(x122, x118, x82);
+  { uint32_t x124 = cmovznz32(x122, x115, x79);
+  { uint32_t x125 = cmovznz32(x122, x112, x76);
+  { uint32_t x126 = cmovznz32(x122, x109, x73);
+  { uint32_t x127 = cmovznz32(x122, x106, x70);
+  { uint32_t x128 = cmovznz32(x122, x103, x67);
+  { uint32_t x129 = cmovznz32(x122, x100, x64);
+  { uint32_t x130 = cmovznz32(x122, x97, x61);
+  { uint32_t x131 = cmovznz32(x122, x94, x58);
+  { uint32_t x132 = cmovznz32(x122, x91, x55);
+  { uint32_t x133 = cmovznz32(x122, x88, x52);
+  { uint32_t x134 = cmovznz32(x122, x85, x49);
   out[0] = x134;
   out[1] = x133;
   out[2] = x132;
diff --git a/src/Specific/montgomery32_2e383m31/feaddDisplay.log b/src/Specific/montgomery32_2e383m31/feaddDisplay.log
index 2fe4e4e2e..d8d6ae3d8 100644
--- a/src/Specific/montgomery32_2e383m31/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e383m31/feaddDisplay.log
@@ -27,18 +27,18 @@ Interp-η
  uint32_t x115, uint8_t x116 = subborrow_u32(x113, x79, 0xffffffff);
  uint32_t x118, uint8_t x119 = subborrow_u32(x116, x82, 0x7fffffff);
  uint32_t _, uint8_t x122 = subborrow_u32(x119, x83, 0x0);
- uint32_t x123 = cmovznz(x122, x118, x82);
- uint32_t x124 = cmovznz(x122, x115, x79);
- uint32_t x125 = cmovznz(x122, x112, x76);
- uint32_t x126 = cmovznz(x122, x109, x73);
- uint32_t x127 = cmovznz(x122, x106, x70);
- uint32_t x128 = cmovznz(x122, x103, x67);
- uint32_t x129 = cmovznz(x122, x100, x64);
- uint32_t x130 = cmovznz(x122, x97, x61);
- uint32_t x131 = cmovznz(x122, x94, x58);
- uint32_t x132 = cmovznz(x122, x91, x55);
- uint32_t x133 = cmovznz(x122, x88, x52);
- uint32_t x134 = cmovznz(x122, x85, x49);
+ uint32_t x123 = cmovznz32(x122, x118, x82);
+ uint32_t x124 = cmovznz32(x122, x115, x79);
+ uint32_t x125 = cmovznz32(x122, x112, x76);
+ uint32_t x126 = cmovznz32(x122, x109, x73);
+ uint32_t x127 = cmovznz32(x122, x106, x70);
+ uint32_t x128 = cmovznz32(x122, x103, x67);
+ uint32_t x129 = cmovznz32(x122, x100, x64);
+ uint32_t x130 = cmovznz32(x122, x97, x61);
+ uint32_t x131 = cmovznz32(x122, x94, x58);
+ uint32_t x132 = cmovznz32(x122, x91, x55);
+ uint32_t x133 = cmovznz32(x122, x88, x52);
+ uint32_t x134 = cmovznz32(x122, x85, x49);
  return (x123, x124, x125, x126, x127, x128, x129, x130, x131, x132, x133, x134))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e383m421/feadd.c b/src/Specific/montgomery32_2e383m421/feadd.c
index e20d02b97..20a590121 100644
--- a/src/Specific/montgomery32_2e383m421/feadd.c
+++ b/src/Specific/montgomery32_2e383m421/feadd.c
@@ -48,18 +48,18 @@ static void feadd(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[1
   { uint32_t x115; uint8_t x116 = _subborrow_u32(x113, x79, 0xffffffff, &x115);
   { uint32_t x118; uint8_t x119 = _subborrow_u32(x116, x82, 0x7fffffff, &x118);
   { uint32_t _; uint8_t x122 = _subborrow_u32(x119, x83, 0x0, &_);
-  { uint32_t x123 = cmovznz(x122, x118, x82);
-  { uint32_t x124 = cmovznz(x122, x115, x79);
-  { uint32_t x125 = cmovznz(x122, x112, x76);
-  { uint32_t x126 = cmovznz(x122, x109, x73);
-  { uint32_t x127 = cmovznz(x122, x106, x70);
-  { uint32_t x128 = cmovznz(x122, x103, x67);
-  { uint32_t x129 = cmovznz(x122, x100, x64);
-  { uint32_t x130 = cmovznz(x122, x97, x61);
-  { uint32_t x131 = cmovznz(x122, x94, x58);
-  { uint32_t x132 = cmovznz(x122, x91, x55);
-  { uint32_t x133 = cmovznz(x122, x88, x52);
-  { uint32_t x134 = cmovznz(x122, x85, x49);
+  { uint32_t x123 = cmovznz32(x122, x118, x82);
+  { uint32_t x124 = cmovznz32(x122, x115, x79);
+  { uint32_t x125 = cmovznz32(x122, x112, x76);
+  { uint32_t x126 = cmovznz32(x122, x109, x73);
+  { uint32_t x127 = cmovznz32(x122, x106, x70);
+  { uint32_t x128 = cmovznz32(x122, x103, x67);
+  { uint32_t x129 = cmovznz32(x122, x100, x64);
+  { uint32_t x130 = cmovznz32(x122, x97, x61);
+  { uint32_t x131 = cmovznz32(x122, x94, x58);
+  { uint32_t x132 = cmovznz32(x122, x91, x55);
+  { uint32_t x133 = cmovznz32(x122, x88, x52);
+  { uint32_t x134 = cmovznz32(x122, x85, x49);
   out[0] = x134;
   out[1] = x133;
   out[2] = x132;
diff --git a/src/Specific/montgomery32_2e383m421/feaddDisplay.log b/src/Specific/montgomery32_2e383m421/feaddDisplay.log
index d91324005..21c18fb82 100644
--- a/src/Specific/montgomery32_2e383m421/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e383m421/feaddDisplay.log
@@ -27,18 +27,18 @@ Interp-η
  uint32_t x115, uint8_t x116 = subborrow_u32(x113, x79, 0xffffffff);
  uint32_t x118, uint8_t x119 = subborrow_u32(x116, x82, 0x7fffffff);
  uint32_t _, uint8_t x122 = subborrow_u32(x119, x83, 0x0);
- uint32_t x123 = cmovznz(x122, x118, x82);
- uint32_t x124 = cmovznz(x122, x115, x79);
- uint32_t x125 = cmovznz(x122, x112, x76);
- uint32_t x126 = cmovznz(x122, x109, x73);
- uint32_t x127 = cmovznz(x122, x106, x70);
- uint32_t x128 = cmovznz(x122, x103, x67);
- uint32_t x129 = cmovznz(x122, x100, x64);
- uint32_t x130 = cmovznz(x122, x97, x61);
- uint32_t x131 = cmovznz(x122, x94, x58);
- uint32_t x132 = cmovznz(x122, x91, x55);
- uint32_t x133 = cmovznz(x122, x88, x52);
- uint32_t x134 = cmovznz(x122, x85, x49);
+ uint32_t x123 = cmovznz32(x122, x118, x82);
+ uint32_t x124 = cmovznz32(x122, x115, x79);
+ uint32_t x125 = cmovznz32(x122, x112, x76);
+ uint32_t x126 = cmovznz32(x122, x109, x73);
+ uint32_t x127 = cmovznz32(x122, x106, x70);
+ uint32_t x128 = cmovznz32(x122, x103, x67);
+ uint32_t x129 = cmovznz32(x122, x100, x64);
+ uint32_t x130 = cmovznz32(x122, x97, x61);
+ uint32_t x131 = cmovznz32(x122, x94, x58);
+ uint32_t x132 = cmovznz32(x122, x91, x55);
+ uint32_t x133 = cmovznz32(x122, x88, x52);
+ uint32_t x134 = cmovznz32(x122, x85, x49);
  return (x123, x124, x125, x126, x127, x128, x129, x130, x131, x132, x133, x134))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e384m2e128m2e96p2e32m1/feadd.c b/src/Specific/montgomery32_2e384m2e128m2e96p2e32m1/feadd.c
index c502564e3..54f5cc05d 100644
--- a/src/Specific/montgomery32_2e384m2e128m2e96p2e32m1/feadd.c
+++ b/src/Specific/montgomery32_2e384m2e128m2e96p2e32m1/feadd.c
@@ -48,18 +48,18 @@ static void feadd(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[1
   { uint32_t x115; uint8_t x116 = _subborrow_u32(x113, x79, 0xffffffff, &x115);
   { uint32_t x118; uint8_t x119 = _subborrow_u32(x116, x82, 0xffffffff, &x118);
   { uint32_t _; uint8_t x122 = _subborrow_u32(x119, x83, 0x0, &_);
-  { uint32_t x123 = cmovznz(x122, x118, x82);
-  { uint32_t x124 = cmovznz(x122, x115, x79);
-  { uint32_t x125 = cmovznz(x122, x112, x76);
-  { uint32_t x126 = cmovznz(x122, x109, x73);
-  { uint32_t x127 = cmovznz(x122, x106, x70);
-  { uint32_t x128 = cmovznz(x122, x103, x67);
-  { uint32_t x129 = cmovznz(x122, x100, x64);
-  { uint32_t x130 = cmovznz(x122, x97, x61);
-  { uint32_t x131 = cmovznz(x122, x94, x58);
-  { uint32_t x132 = cmovznz(x122, x91, x55);
-  { uint32_t x133 = cmovznz(x122, x88, x52);
-  { uint32_t x134 = cmovznz(x122, x85, x49);
+  { uint32_t x123 = cmovznz32(x122, x118, x82);
+  { uint32_t x124 = cmovznz32(x122, x115, x79);
+  { uint32_t x125 = cmovznz32(x122, x112, x76);
+  { uint32_t x126 = cmovznz32(x122, x109, x73);
+  { uint32_t x127 = cmovznz32(x122, x106, x70);
+  { uint32_t x128 = cmovznz32(x122, x103, x67);
+  { uint32_t x129 = cmovznz32(x122, x100, x64);
+  { uint32_t x130 = cmovznz32(x122, x97, x61);
+  { uint32_t x131 = cmovznz32(x122, x94, x58);
+  { uint32_t x132 = cmovznz32(x122, x91, x55);
+  { uint32_t x133 = cmovznz32(x122, x88, x52);
+  { uint32_t x134 = cmovznz32(x122, x85, x49);
   out[0] = x134;
   out[1] = x133;
   out[2] = x132;
diff --git a/src/Specific/montgomery32_2e384m2e128m2e96p2e32m1/feaddDisplay.log b/src/Specific/montgomery32_2e384m2e128m2e96p2e32m1/feaddDisplay.log
index 07eb890d9..3cef03129 100644
--- a/src/Specific/montgomery32_2e384m2e128m2e96p2e32m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e384m2e128m2e96p2e32m1/feaddDisplay.log
@@ -27,18 +27,18 @@ Interp-η
  uint32_t x115, uint8_t x116 = subborrow_u32(x113, x79, 0xffffffff);
  uint32_t x118, uint8_t x119 = subborrow_u32(x116, x82, 0xffffffff);
  uint32_t _, uint8_t x122 = subborrow_u32(x119, x83, 0x0);
- uint32_t x123 = cmovznz(x122, x118, x82);
- uint32_t x124 = cmovznz(x122, x115, x79);
- uint32_t x125 = cmovznz(x122, x112, x76);
- uint32_t x126 = cmovznz(x122, x109, x73);
- uint32_t x127 = cmovznz(x122, x106, x70);
- uint32_t x128 = cmovznz(x122, x103, x67);
- uint32_t x129 = cmovznz(x122, x100, x64);
- uint32_t x130 = cmovznz(x122, x97, x61);
- uint32_t x131 = cmovznz(x122, x94, x58);
- uint32_t x132 = cmovznz(x122, x91, x55);
- uint32_t x133 = cmovznz(x122, x88, x52);
- uint32_t x134 = cmovznz(x122, x85, x49);
+ uint32_t x123 = cmovznz32(x122, x118, x82);
+ uint32_t x124 = cmovznz32(x122, x115, x79);
+ uint32_t x125 = cmovznz32(x122, x112, x76);
+ uint32_t x126 = cmovznz32(x122, x109, x73);
+ uint32_t x127 = cmovznz32(x122, x106, x70);
+ uint32_t x128 = cmovznz32(x122, x103, x67);
+ uint32_t x129 = cmovznz32(x122, x100, x64);
+ uint32_t x130 = cmovznz32(x122, x97, x61);
+ uint32_t x131 = cmovznz32(x122, x94, x58);
+ uint32_t x132 = cmovznz32(x122, x91, x55);
+ uint32_t x133 = cmovznz32(x122, x88, x52);
+ uint32_t x134 = cmovznz32(x122, x85, x49);
  return (x123, x124, x125, x126, x127, x128, x129, x130, x131, x132, x133, x134))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e384m317/feadd.c b/src/Specific/montgomery32_2e384m317/feadd.c
index 531c2f325..ac3bf445a 100644
--- a/src/Specific/montgomery32_2e384m317/feadd.c
+++ b/src/Specific/montgomery32_2e384m317/feadd.c
@@ -48,18 +48,18 @@ static void feadd(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[1
   { uint32_t x115; uint8_t x116 = _subborrow_u32(x113, x79, 0xffffffff, &x115);
   { uint32_t x118; uint8_t x119 = _subborrow_u32(x116, x82, 0xffffffff, &x118);
   { uint32_t _; uint8_t x122 = _subborrow_u32(x119, x83, 0x0, &_);
-  { uint32_t x123 = cmovznz(x122, x118, x82);
-  { uint32_t x124 = cmovznz(x122, x115, x79);
-  { uint32_t x125 = cmovznz(x122, x112, x76);
-  { uint32_t x126 = cmovznz(x122, x109, x73);
-  { uint32_t x127 = cmovznz(x122, x106, x70);
-  { uint32_t x128 = cmovznz(x122, x103, x67);
-  { uint32_t x129 = cmovznz(x122, x100, x64);
-  { uint32_t x130 = cmovznz(x122, x97, x61);
-  { uint32_t x131 = cmovznz(x122, x94, x58);
-  { uint32_t x132 = cmovznz(x122, x91, x55);
-  { uint32_t x133 = cmovznz(x122, x88, x52);
-  { uint32_t x134 = cmovznz(x122, x85, x49);
+  { uint32_t x123 = cmovznz32(x122, x118, x82);
+  { uint32_t x124 = cmovznz32(x122, x115, x79);
+  { uint32_t x125 = cmovznz32(x122, x112, x76);
+  { uint32_t x126 = cmovznz32(x122, x109, x73);
+  { uint32_t x127 = cmovznz32(x122, x106, x70);
+  { uint32_t x128 = cmovznz32(x122, x103, x67);
+  { uint32_t x129 = cmovznz32(x122, x100, x64);
+  { uint32_t x130 = cmovznz32(x122, x97, x61);
+  { uint32_t x131 = cmovznz32(x122, x94, x58);
+  { uint32_t x132 = cmovznz32(x122, x91, x55);
+  { uint32_t x133 = cmovznz32(x122, x88, x52);
+  { uint32_t x134 = cmovznz32(x122, x85, x49);
   out[0] = x134;
   out[1] = x133;
   out[2] = x132;
diff --git a/src/Specific/montgomery32_2e384m317/feaddDisplay.log b/src/Specific/montgomery32_2e384m317/feaddDisplay.log
index 06474e5f4..d6ec1994f 100644
--- a/src/Specific/montgomery32_2e384m317/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e384m317/feaddDisplay.log
@@ -27,18 +27,18 @@ Interp-η
  uint32_t x115, uint8_t x116 = subborrow_u32(x113, x79, 0xffffffff);
  uint32_t x118, uint8_t x119 = subborrow_u32(x116, x82, 0xffffffff);
  uint32_t _, uint8_t x122 = subborrow_u32(x119, x83, 0x0);
- uint32_t x123 = cmovznz(x122, x118, x82);
- uint32_t x124 = cmovznz(x122, x115, x79);
- uint32_t x125 = cmovznz(x122, x112, x76);
- uint32_t x126 = cmovznz(x122, x109, x73);
- uint32_t x127 = cmovznz(x122, x106, x70);
- uint32_t x128 = cmovznz(x122, x103, x67);
- uint32_t x129 = cmovznz(x122, x100, x64);
- uint32_t x130 = cmovznz(x122, x97, x61);
- uint32_t x131 = cmovznz(x122, x94, x58);
- uint32_t x132 = cmovznz(x122, x91, x55);
- uint32_t x133 = cmovznz(x122, x88, x52);
- uint32_t x134 = cmovznz(x122, x85, x49);
+ uint32_t x123 = cmovznz32(x122, x118, x82);
+ uint32_t x124 = cmovznz32(x122, x115, x79);
+ uint32_t x125 = cmovznz32(x122, x112, x76);
+ uint32_t x126 = cmovznz32(x122, x109, x73);
+ uint32_t x127 = cmovznz32(x122, x106, x70);
+ uint32_t x128 = cmovznz32(x122, x103, x67);
+ uint32_t x129 = cmovznz32(x122, x100, x64);
+ uint32_t x130 = cmovznz32(x122, x97, x61);
+ uint32_t x131 = cmovznz32(x122, x94, x58);
+ uint32_t x132 = cmovznz32(x122, x91, x55);
+ uint32_t x133 = cmovznz32(x122, x88, x52);
+ uint32_t x134 = cmovznz32(x122, x85, x49);
  return (x123, x124, x125, x126, x127, x128, x129, x130, x131, x132, x133, x134))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e384m5x2e368m1/feadd.c b/src/Specific/montgomery32_2e384m5x2e368m1/feadd.c
index b987e3baa..66bd374ad 100644
--- a/src/Specific/montgomery32_2e384m5x2e368m1/feadd.c
+++ b/src/Specific/montgomery32_2e384m5x2e368m1/feadd.c
@@ -48,18 +48,18 @@ static void feadd(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[1
   { uint32_t x115; uint8_t x116 = _subborrow_u32(x113, x79, 0xffffffff, &x115);
   { uint32_t x118; uint8_t x119 = _subborrow_u32(x116, x82, 0xfffaffff, &x118);
   { uint32_t _; uint8_t x122 = _subborrow_u32(x119, x83, 0x0, &_);
-  { uint32_t x123 = cmovznz(x122, x118, x82);
-  { uint32_t x124 = cmovznz(x122, x115, x79);
-  { uint32_t x125 = cmovznz(x122, x112, x76);
-  { uint32_t x126 = cmovznz(x122, x109, x73);
-  { uint32_t x127 = cmovznz(x122, x106, x70);
-  { uint32_t x128 = cmovznz(x122, x103, x67);
-  { uint32_t x129 = cmovznz(x122, x100, x64);
-  { uint32_t x130 = cmovznz(x122, x97, x61);
-  { uint32_t x131 = cmovznz(x122, x94, x58);
-  { uint32_t x132 = cmovznz(x122, x91, x55);
-  { uint32_t x133 = cmovznz(x122, x88, x52);
-  { uint32_t x134 = cmovznz(x122, x85, x49);
+  { uint32_t x123 = cmovznz32(x122, x118, x82);
+  { uint32_t x124 = cmovznz32(x122, x115, x79);
+  { uint32_t x125 = cmovznz32(x122, x112, x76);
+  { uint32_t x126 = cmovznz32(x122, x109, x73);
+  { uint32_t x127 = cmovznz32(x122, x106, x70);
+  { uint32_t x128 = cmovznz32(x122, x103, x67);
+  { uint32_t x129 = cmovznz32(x122, x100, x64);
+  { uint32_t x130 = cmovznz32(x122, x97, x61);
+  { uint32_t x131 = cmovznz32(x122, x94, x58);
+  { uint32_t x132 = cmovznz32(x122, x91, x55);
+  { uint32_t x133 = cmovznz32(x122, x88, x52);
+  { uint32_t x134 = cmovznz32(x122, x85, x49);
   out[0] = x134;
   out[1] = x133;
   out[2] = x132;
diff --git a/src/Specific/montgomery32_2e384m5x2e368m1/feaddDisplay.log b/src/Specific/montgomery32_2e384m5x2e368m1/feaddDisplay.log
index 00d1e254b..d13f97195 100644
--- a/src/Specific/montgomery32_2e384m5x2e368m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e384m5x2e368m1/feaddDisplay.log
@@ -27,18 +27,18 @@ Interp-η
  uint32_t x115, uint8_t x116 = subborrow_u32(x113, x79, 0xffffffff);
  uint32_t x118, uint8_t x119 = subborrow_u32(x116, x82, 0xfffaffff);
  uint32_t _, uint8_t x122 = subborrow_u32(x119, x83, 0x0);
- uint32_t x123 = cmovznz(x122, x118, x82);
- uint32_t x124 = cmovznz(x122, x115, x79);
- uint32_t x125 = cmovznz(x122, x112, x76);
- uint32_t x126 = cmovznz(x122, x109, x73);
- uint32_t x127 = cmovznz(x122, x106, x70);
- uint32_t x128 = cmovznz(x122, x103, x67);
- uint32_t x129 = cmovznz(x122, x100, x64);
- uint32_t x130 = cmovznz(x122, x97, x61);
- uint32_t x131 = cmovznz(x122, x94, x58);
- uint32_t x132 = cmovznz(x122, x91, x55);
- uint32_t x133 = cmovznz(x122, x88, x52);
- uint32_t x134 = cmovznz(x122, x85, x49);
+ uint32_t x123 = cmovznz32(x122, x118, x82);
+ uint32_t x124 = cmovznz32(x122, x115, x79);
+ uint32_t x125 = cmovznz32(x122, x112, x76);
+ uint32_t x126 = cmovznz32(x122, x109, x73);
+ uint32_t x127 = cmovznz32(x122, x106, x70);
+ uint32_t x128 = cmovznz32(x122, x103, x67);
+ uint32_t x129 = cmovznz32(x122, x100, x64);
+ uint32_t x130 = cmovznz32(x122, x97, x61);
+ uint32_t x131 = cmovznz32(x122, x94, x58);
+ uint32_t x132 = cmovznz32(x122, x91, x55);
+ uint32_t x133 = cmovznz32(x122, x88, x52);
+ uint32_t x134 = cmovznz32(x122, x85, x49);
  return (x123, x124, x125, x126, x127, x128, x129, x130, x131, x132, x133, x134))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e384m79x2e376m1/feadd.c b/src/Specific/montgomery32_2e384m79x2e376m1/feadd.c
index 7ef8740fc..52b84f7c0 100644
--- a/src/Specific/montgomery32_2e384m79x2e376m1/feadd.c
+++ b/src/Specific/montgomery32_2e384m79x2e376m1/feadd.c
@@ -48,18 +48,18 @@ static void feadd(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[1
   { uint32_t x115; uint8_t x116 = _subborrow_u32(x113, x79, 0xffffffff, &x115);
   { uint32_t x118; uint8_t x119 = _subborrow_u32(x116, x82, 0xb0ffffff, &x118);
   { uint32_t _; uint8_t x122 = _subborrow_u32(x119, x83, 0x0, &_);
-  { uint32_t x123 = cmovznz(x122, x118, x82);
-  { uint32_t x124 = cmovznz(x122, x115, x79);
-  { uint32_t x125 = cmovznz(x122, x112, x76);
-  { uint32_t x126 = cmovznz(x122, x109, x73);
-  { uint32_t x127 = cmovznz(x122, x106, x70);
-  { uint32_t x128 = cmovznz(x122, x103, x67);
-  { uint32_t x129 = cmovznz(x122, x100, x64);
-  { uint32_t x130 = cmovznz(x122, x97, x61);
-  { uint32_t x131 = cmovznz(x122, x94, x58);
-  { uint32_t x132 = cmovznz(x122, x91, x55);
-  { uint32_t x133 = cmovznz(x122, x88, x52);
-  { uint32_t x134 = cmovznz(x122, x85, x49);
+  { uint32_t x123 = cmovznz32(x122, x118, x82);
+  { uint32_t x124 = cmovznz32(x122, x115, x79);
+  { uint32_t x125 = cmovznz32(x122, x112, x76);
+  { uint32_t x126 = cmovznz32(x122, x109, x73);
+  { uint32_t x127 = cmovznz32(x122, x106, x70);
+  { uint32_t x128 = cmovznz32(x122, x103, x67);
+  { uint32_t x129 = cmovznz32(x122, x100, x64);
+  { uint32_t x130 = cmovznz32(x122, x97, x61);
+  { uint32_t x131 = cmovznz32(x122, x94, x58);
+  { uint32_t x132 = cmovznz32(x122, x91, x55);
+  { uint32_t x133 = cmovznz32(x122, x88, x52);
+  { uint32_t x134 = cmovznz32(x122, x85, x49);
   out[0] = x134;
   out[1] = x133;
   out[2] = x132;
diff --git a/src/Specific/montgomery32_2e384m79x2e376m1/feaddDisplay.log b/src/Specific/montgomery32_2e384m79x2e376m1/feaddDisplay.log
index 2870d1966..a0a196ff2 100644
--- a/src/Specific/montgomery32_2e384m79x2e376m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e384m79x2e376m1/feaddDisplay.log
@@ -27,18 +27,18 @@ Interp-η
  uint32_t x115, uint8_t x116 = subborrow_u32(x113, x79, 0xffffffff);
  uint32_t x118, uint8_t x119 = subborrow_u32(x116, x82, 0xb0ffffff);
  uint32_t _, uint8_t x122 = subborrow_u32(x119, x83, 0x0);
- uint32_t x123 = cmovznz(x122, x118, x82);
- uint32_t x124 = cmovznz(x122, x115, x79);
- uint32_t x125 = cmovznz(x122, x112, x76);
- uint32_t x126 = cmovznz(x122, x109, x73);
- uint32_t x127 = cmovznz(x122, x106, x70);
- uint32_t x128 = cmovznz(x122, x103, x67);
- uint32_t x129 = cmovznz(x122, x100, x64);
- uint32_t x130 = cmovznz(x122, x97, x61);
- uint32_t x131 = cmovznz(x122, x94, x58);
- uint32_t x132 = cmovznz(x122, x91, x55);
- uint32_t x133 = cmovznz(x122, x88, x52);
- uint32_t x134 = cmovznz(x122, x85, x49);
+ uint32_t x123 = cmovznz32(x122, x118, x82);
+ uint32_t x124 = cmovznz32(x122, x115, x79);
+ uint32_t x125 = cmovznz32(x122, x112, x76);
+ uint32_t x126 = cmovznz32(x122, x109, x73);
+ uint32_t x127 = cmovznz32(x122, x106, x70);
+ uint32_t x128 = cmovznz32(x122, x103, x67);
+ uint32_t x129 = cmovznz32(x122, x100, x64);
+ uint32_t x130 = cmovznz32(x122, x97, x61);
+ uint32_t x131 = cmovznz32(x122, x94, x58);
+ uint32_t x132 = cmovznz32(x122, x91, x55);
+ uint32_t x133 = cmovznz32(x122, x88, x52);
+ uint32_t x134 = cmovznz32(x122, x85, x49);
  return (x123, x124, x125, x126, x127, x128, x129, x130, x131, x132, x133, x134))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e389m21/feadd.c b/src/Specific/montgomery32_2e389m21/feadd.c
index f84bbc134..ac55d2332 100644
--- a/src/Specific/montgomery32_2e389m21/feadd.c
+++ b/src/Specific/montgomery32_2e389m21/feadd.c
@@ -52,19 +52,19 @@ static void feadd(uint32_t out[13], const uint32_t in1[13], const uint32_t in2[1
   { uint32_t x125; uint8_t x126 = _subborrow_u32(x123, x86, 0xffffffff, &x125);
   { uint32_t x128; uint8_t x129 = _subborrow_u32(x126, x89, 0x1f, &x128);
   { uint32_t _; uint8_t x132 = _subborrow_u32(x129, x90, 0x0, &_);
-  { uint32_t x133 = cmovznz(x132, x128, x89);
-  { uint32_t x134 = cmovznz(x132, x125, x86);
-  { uint32_t x135 = cmovznz(x132, x122, x83);
-  { uint32_t x136 = cmovznz(x132, x119, x80);
-  { uint32_t x137 = cmovznz(x132, x116, x77);
-  { uint32_t x138 = cmovznz(x132, x113, x74);
-  { uint32_t x139 = cmovznz(x132, x110, x71);
-  { uint32_t x140 = cmovznz(x132, x107, x68);
-  { uint32_t x141 = cmovznz(x132, x104, x65);
-  { uint32_t x142 = cmovznz(x132, x101, x62);
-  { uint32_t x143 = cmovznz(x132, x98, x59);
-  { uint32_t x144 = cmovznz(x132, x95, x56);
-  { uint32_t x145 = cmovznz(x132, x92, x53);
+  { uint32_t x133 = cmovznz32(x132, x128, x89);
+  { uint32_t x134 = cmovznz32(x132, x125, x86);
+  { uint32_t x135 = cmovznz32(x132, x122, x83);
+  { uint32_t x136 = cmovznz32(x132, x119, x80);
+  { uint32_t x137 = cmovznz32(x132, x116, x77);
+  { uint32_t x138 = cmovznz32(x132, x113, x74);
+  { uint32_t x139 = cmovznz32(x132, x110, x71);
+  { uint32_t x140 = cmovznz32(x132, x107, x68);
+  { uint32_t x141 = cmovznz32(x132, x104, x65);
+  { uint32_t x142 = cmovznz32(x132, x101, x62);
+  { uint32_t x143 = cmovznz32(x132, x98, x59);
+  { uint32_t x144 = cmovznz32(x132, x95, x56);
+  { uint32_t x145 = cmovznz32(x132, x92, x53);
   out[0] = x145;
   out[1] = x144;
   out[2] = x143;
diff --git a/src/Specific/montgomery32_2e389m21/feaddDisplay.log b/src/Specific/montgomery32_2e389m21/feaddDisplay.log
index 2191c1449..c4db24a28 100644
--- a/src/Specific/montgomery32_2e389m21/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e389m21/feaddDisplay.log
@@ -29,19 +29,19 @@ Interp-η
  uint32_t x125, uint8_t x126 = subborrow_u32(x123, x86, 0xffffffff);
  uint32_t x128, uint8_t x129 = subborrow_u32(x126, x89, 0x1f);
  uint32_t _, uint8_t x132 = subborrow_u32(x129, x90, 0x0);
- uint32_t x133 = cmovznz(x132, x128, x89);
- uint32_t x134 = cmovznz(x132, x125, x86);
- uint32_t x135 = cmovznz(x132, x122, x83);
- uint32_t x136 = cmovznz(x132, x119, x80);
- uint32_t x137 = cmovznz(x132, x116, x77);
- uint32_t x138 = cmovznz(x132, x113, x74);
- uint32_t x139 = cmovznz(x132, x110, x71);
- uint32_t x140 = cmovznz(x132, x107, x68);
- uint32_t x141 = cmovznz(x132, x104, x65);
- uint32_t x142 = cmovznz(x132, x101, x62);
- uint32_t x143 = cmovznz(x132, x98, x59);
- uint32_t x144 = cmovznz(x132, x95, x56);
- uint32_t x145 = cmovznz(x132, x92, x53);
+ uint32_t x133 = cmovznz32(x132, x128, x89);
+ uint32_t x134 = cmovznz32(x132, x125, x86);
+ uint32_t x135 = cmovznz32(x132, x122, x83);
+ uint32_t x136 = cmovznz32(x132, x119, x80);
+ uint32_t x137 = cmovznz32(x132, x116, x77);
+ uint32_t x138 = cmovznz32(x132, x113, x74);
+ uint32_t x139 = cmovznz32(x132, x110, x71);
+ uint32_t x140 = cmovznz32(x132, x107, x68);
+ uint32_t x141 = cmovznz32(x132, x104, x65);
+ uint32_t x142 = cmovznz32(x132, x101, x62);
+ uint32_t x143 = cmovznz32(x132, x98, x59);
+ uint32_t x144 = cmovznz32(x132, x95, x56);
+ uint32_t x145 = cmovznz32(x132, x92, x53);
  return (x133, x134, x135, x136, x137, x138, x139, x140, x141, x142, x143, x144, x145))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e401m31/feadd.c b/src/Specific/montgomery32_2e401m31/feadd.c
index b90810dd4..2a35ceda2 100644
--- a/src/Specific/montgomery32_2e401m31/feadd.c
+++ b/src/Specific/montgomery32_2e401m31/feadd.c
@@ -52,19 +52,19 @@ static void feadd(uint32_t out[13], const uint32_t in1[13], const uint32_t in2[1
   { uint32_t x125; uint8_t x126 = _subborrow_u32(x123, x86, 0xffffffff, &x125);
   { uint32_t x128; uint8_t x129 = _subborrow_u32(x126, x89, 0x1ffff, &x128);
   { uint32_t _; uint8_t x132 = _subborrow_u32(x129, x90, 0x0, &_);
-  { uint32_t x133 = cmovznz(x132, x128, x89);
-  { uint32_t x134 = cmovznz(x132, x125, x86);
-  { uint32_t x135 = cmovznz(x132, x122, x83);
-  { uint32_t x136 = cmovznz(x132, x119, x80);
-  { uint32_t x137 = cmovznz(x132, x116, x77);
-  { uint32_t x138 = cmovznz(x132, x113, x74);
-  { uint32_t x139 = cmovznz(x132, x110, x71);
-  { uint32_t x140 = cmovznz(x132, x107, x68);
-  { uint32_t x141 = cmovznz(x132, x104, x65);
-  { uint32_t x142 = cmovznz(x132, x101, x62);
-  { uint32_t x143 = cmovznz(x132, x98, x59);
-  { uint32_t x144 = cmovznz(x132, x95, x56);
-  { uint32_t x145 = cmovznz(x132, x92, x53);
+  { uint32_t x133 = cmovznz32(x132, x128, x89);
+  { uint32_t x134 = cmovznz32(x132, x125, x86);
+  { uint32_t x135 = cmovznz32(x132, x122, x83);
+  { uint32_t x136 = cmovznz32(x132, x119, x80);
+  { uint32_t x137 = cmovznz32(x132, x116, x77);
+  { uint32_t x138 = cmovznz32(x132, x113, x74);
+  { uint32_t x139 = cmovznz32(x132, x110, x71);
+  { uint32_t x140 = cmovznz32(x132, x107, x68);
+  { uint32_t x141 = cmovznz32(x132, x104, x65);
+  { uint32_t x142 = cmovznz32(x132, x101, x62);
+  { uint32_t x143 = cmovznz32(x132, x98, x59);
+  { uint32_t x144 = cmovznz32(x132, x95, x56);
+  { uint32_t x145 = cmovznz32(x132, x92, x53);
   out[0] = x145;
   out[1] = x144;
   out[2] = x143;
diff --git a/src/Specific/montgomery32_2e401m31/feaddDisplay.log b/src/Specific/montgomery32_2e401m31/feaddDisplay.log
index a351736fa..24b1f0bba 100644
--- a/src/Specific/montgomery32_2e401m31/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e401m31/feaddDisplay.log
@@ -29,19 +29,19 @@ Interp-η
  uint32_t x125, uint8_t x126 = subborrow_u32(x123, x86, 0xffffffff);
  uint32_t x128, uint8_t x129 = subborrow_u32(x126, x89, 0x1ffff);
  uint32_t _, uint8_t x132 = subborrow_u32(x129, x90, 0x0);
- uint32_t x133 = cmovznz(x132, x128, x89);
- uint32_t x134 = cmovznz(x132, x125, x86);
- uint32_t x135 = cmovznz(x132, x122, x83);
- uint32_t x136 = cmovznz(x132, x119, x80);
- uint32_t x137 = cmovznz(x132, x116, x77);
- uint32_t x138 = cmovznz(x132, x113, x74);
- uint32_t x139 = cmovznz(x132, x110, x71);
- uint32_t x140 = cmovznz(x132, x107, x68);
- uint32_t x141 = cmovznz(x132, x104, x65);
- uint32_t x142 = cmovznz(x132, x101, x62);
- uint32_t x143 = cmovznz(x132, x98, x59);
- uint32_t x144 = cmovznz(x132, x95, x56);
- uint32_t x145 = cmovznz(x132, x92, x53);
+ uint32_t x133 = cmovznz32(x132, x128, x89);
+ uint32_t x134 = cmovznz32(x132, x125, x86);
+ uint32_t x135 = cmovznz32(x132, x122, x83);
+ uint32_t x136 = cmovznz32(x132, x119, x80);
+ uint32_t x137 = cmovznz32(x132, x116, x77);
+ uint32_t x138 = cmovznz32(x132, x113, x74);
+ uint32_t x139 = cmovznz32(x132, x110, x71);
+ uint32_t x140 = cmovznz32(x132, x107, x68);
+ uint32_t x141 = cmovznz32(x132, x104, x65);
+ uint32_t x142 = cmovznz32(x132, x101, x62);
+ uint32_t x143 = cmovznz32(x132, x98, x59);
+ uint32_t x144 = cmovznz32(x132, x95, x56);
+ uint32_t x145 = cmovznz32(x132, x92, x53);
  return (x133, x134, x135, x136, x137, x138, x139, x140, x141, x142, x143, x144, x145))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e413m21/feadd.c b/src/Specific/montgomery32_2e413m21/feadd.c
index 721eff4d6..23d76ab4d 100644
--- a/src/Specific/montgomery32_2e413m21/feadd.c
+++ b/src/Specific/montgomery32_2e413m21/feadd.c
@@ -52,19 +52,19 @@ static void feadd(uint32_t out[13], const uint32_t in1[13], const uint32_t in2[1
   { uint32_t x125; uint8_t x126 = _subborrow_u32(x123, x86, 0xffffffff, &x125);
   { uint32_t x128; uint8_t x129 = _subborrow_u32(x126, x89, 0x1fffffff, &x128);
   { uint32_t _; uint8_t x132 = _subborrow_u32(x129, x90, 0x0, &_);
-  { uint32_t x133 = cmovznz(x132, x128, x89);
-  { uint32_t x134 = cmovznz(x132, x125, x86);
-  { uint32_t x135 = cmovznz(x132, x122, x83);
-  { uint32_t x136 = cmovznz(x132, x119, x80);
-  { uint32_t x137 = cmovznz(x132, x116, x77);
-  { uint32_t x138 = cmovznz(x132, x113, x74);
-  { uint32_t x139 = cmovznz(x132, x110, x71);
-  { uint32_t x140 = cmovznz(x132, x107, x68);
-  { uint32_t x141 = cmovznz(x132, x104, x65);
-  { uint32_t x142 = cmovznz(x132, x101, x62);
-  { uint32_t x143 = cmovznz(x132, x98, x59);
-  { uint32_t x144 = cmovznz(x132, x95, x56);
-  { uint32_t x145 = cmovznz(x132, x92, x53);
+  { uint32_t x133 = cmovznz32(x132, x128, x89);
+  { uint32_t x134 = cmovznz32(x132, x125, x86);
+  { uint32_t x135 = cmovznz32(x132, x122, x83);
+  { uint32_t x136 = cmovznz32(x132, x119, x80);
+  { uint32_t x137 = cmovznz32(x132, x116, x77);
+  { uint32_t x138 = cmovznz32(x132, x113, x74);
+  { uint32_t x139 = cmovznz32(x132, x110, x71);
+  { uint32_t x140 = cmovznz32(x132, x107, x68);
+  { uint32_t x141 = cmovznz32(x132, x104, x65);
+  { uint32_t x142 = cmovznz32(x132, x101, x62);
+  { uint32_t x143 = cmovznz32(x132, x98, x59);
+  { uint32_t x144 = cmovznz32(x132, x95, x56);
+  { uint32_t x145 = cmovznz32(x132, x92, x53);
   out[0] = x145;
   out[1] = x144;
   out[2] = x143;
diff --git a/src/Specific/montgomery32_2e413m21/feaddDisplay.log b/src/Specific/montgomery32_2e413m21/feaddDisplay.log
index 7752bdf15..05c4f5ed1 100644
--- a/src/Specific/montgomery32_2e413m21/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e413m21/feaddDisplay.log
@@ -29,19 +29,19 @@ Interp-η
  uint32_t x125, uint8_t x126 = subborrow_u32(x123, x86, 0xffffffff);
  uint32_t x128, uint8_t x129 = subborrow_u32(x126, x89, 0x1fffffff);
  uint32_t _, uint8_t x132 = subborrow_u32(x129, x90, 0x0);
- uint32_t x133 = cmovznz(x132, x128, x89);
- uint32_t x134 = cmovznz(x132, x125, x86);
- uint32_t x135 = cmovznz(x132, x122, x83);
- uint32_t x136 = cmovznz(x132, x119, x80);
- uint32_t x137 = cmovznz(x132, x116, x77);
- uint32_t x138 = cmovznz(x132, x113, x74);
- uint32_t x139 = cmovznz(x132, x110, x71);
- uint32_t x140 = cmovznz(x132, x107, x68);
- uint32_t x141 = cmovznz(x132, x104, x65);
- uint32_t x142 = cmovznz(x132, x101, x62);
- uint32_t x143 = cmovznz(x132, x98, x59);
- uint32_t x144 = cmovznz(x132, x95, x56);
- uint32_t x145 = cmovznz(x132, x92, x53);
+ uint32_t x133 = cmovznz32(x132, x128, x89);
+ uint32_t x134 = cmovznz32(x132, x125, x86);
+ uint32_t x135 = cmovznz32(x132, x122, x83);
+ uint32_t x136 = cmovznz32(x132, x119, x80);
+ uint32_t x137 = cmovznz32(x132, x116, x77);
+ uint32_t x138 = cmovznz32(x132, x113, x74);
+ uint32_t x139 = cmovznz32(x132, x110, x71);
+ uint32_t x140 = cmovznz32(x132, x107, x68);
+ uint32_t x141 = cmovznz32(x132, x104, x65);
+ uint32_t x142 = cmovznz32(x132, x101, x62);
+ uint32_t x143 = cmovznz32(x132, x98, x59);
+ uint32_t x144 = cmovznz32(x132, x95, x56);
+ uint32_t x145 = cmovznz32(x132, x92, x53);
  return (x133, x134, x135, x136, x137, x138, x139, x140, x141, x142, x143, x144, x145))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e414m17/feadd.c b/src/Specific/montgomery32_2e414m17/feadd.c
index e84e3c240..4ea3fef54 100644
--- a/src/Specific/montgomery32_2e414m17/feadd.c
+++ b/src/Specific/montgomery32_2e414m17/feadd.c
@@ -52,19 +52,19 @@ static void feadd(uint32_t out[13], const uint32_t in1[13], const uint32_t in2[1
   { uint32_t x125; uint8_t x126 = _subborrow_u32(x123, x86, 0xffffffff, &x125);
   { uint32_t x128; uint8_t x129 = _subborrow_u32(x126, x89, 0x3fffffff, &x128);
   { uint32_t _; uint8_t x132 = _subborrow_u32(x129, x90, 0x0, &_);
-  { uint32_t x133 = cmovznz(x132, x128, x89);
-  { uint32_t x134 = cmovznz(x132, x125, x86);
-  { uint32_t x135 = cmovznz(x132, x122, x83);
-  { uint32_t x136 = cmovznz(x132, x119, x80);
-  { uint32_t x137 = cmovznz(x132, x116, x77);
-  { uint32_t x138 = cmovznz(x132, x113, x74);
-  { uint32_t x139 = cmovznz(x132, x110, x71);
-  { uint32_t x140 = cmovznz(x132, x107, x68);
-  { uint32_t x141 = cmovznz(x132, x104, x65);
-  { uint32_t x142 = cmovznz(x132, x101, x62);
-  { uint32_t x143 = cmovznz(x132, x98, x59);
-  { uint32_t x144 = cmovznz(x132, x95, x56);
-  { uint32_t x145 = cmovznz(x132, x92, x53);
+  { uint32_t x133 = cmovznz32(x132, x128, x89);
+  { uint32_t x134 = cmovznz32(x132, x125, x86);
+  { uint32_t x135 = cmovznz32(x132, x122, x83);
+  { uint32_t x136 = cmovznz32(x132, x119, x80);
+  { uint32_t x137 = cmovznz32(x132, x116, x77);
+  { uint32_t x138 = cmovznz32(x132, x113, x74);
+  { uint32_t x139 = cmovznz32(x132, x110, x71);
+  { uint32_t x140 = cmovznz32(x132, x107, x68);
+  { uint32_t x141 = cmovznz32(x132, x104, x65);
+  { uint32_t x142 = cmovznz32(x132, x101, x62);
+  { uint32_t x143 = cmovznz32(x132, x98, x59);
+  { uint32_t x144 = cmovznz32(x132, x95, x56);
+  { uint32_t x145 = cmovznz32(x132, x92, x53);
   out[0] = x145;
   out[1] = x144;
   out[2] = x143;
diff --git a/src/Specific/montgomery32_2e414m17/feaddDisplay.log b/src/Specific/montgomery32_2e414m17/feaddDisplay.log
index 01c183eb3..0e9b0c7f7 100644
--- a/src/Specific/montgomery32_2e414m17/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e414m17/feaddDisplay.log
@@ -29,19 +29,19 @@ Interp-η
  uint32_t x125, uint8_t x126 = subborrow_u32(x123, x86, 0xffffffff);
  uint32_t x128, uint8_t x129 = subborrow_u32(x126, x89, 0x3fffffff);
  uint32_t _, uint8_t x132 = subborrow_u32(x129, x90, 0x0);
- uint32_t x133 = cmovznz(x132, x128, x89);
- uint32_t x134 = cmovznz(x132, x125, x86);
- uint32_t x135 = cmovznz(x132, x122, x83);
- uint32_t x136 = cmovznz(x132, x119, x80);
- uint32_t x137 = cmovznz(x132, x116, x77);
- uint32_t x138 = cmovznz(x132, x113, x74);
- uint32_t x139 = cmovznz(x132, x110, x71);
- uint32_t x140 = cmovznz(x132, x107, x68);
- uint32_t x141 = cmovznz(x132, x104, x65);
- uint32_t x142 = cmovznz(x132, x101, x62);
- uint32_t x143 = cmovznz(x132, x98, x59);
- uint32_t x144 = cmovznz(x132, x95, x56);
- uint32_t x145 = cmovznz(x132, x92, x53);
+ uint32_t x133 = cmovznz32(x132, x128, x89);
+ uint32_t x134 = cmovznz32(x132, x125, x86);
+ uint32_t x135 = cmovznz32(x132, x122, x83);
+ uint32_t x136 = cmovznz32(x132, x119, x80);
+ uint32_t x137 = cmovznz32(x132, x116, x77);
+ uint32_t x138 = cmovznz32(x132, x113, x74);
+ uint32_t x139 = cmovznz32(x132, x110, x71);
+ uint32_t x140 = cmovznz32(x132, x107, x68);
+ uint32_t x141 = cmovznz32(x132, x104, x65);
+ uint32_t x142 = cmovznz32(x132, x101, x62);
+ uint32_t x143 = cmovznz32(x132, x98, x59);
+ uint32_t x144 = cmovznz32(x132, x95, x56);
+ uint32_t x145 = cmovznz32(x132, x92, x53);
  return (x133, x134, x135, x136, x137, x138, x139, x140, x141, x142, x143, x144, x145))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e416m2e208m1/feadd.c b/src/Specific/montgomery32_2e416m2e208m1/feadd.c
index 18bca8b9a..400048e0d 100644
--- a/src/Specific/montgomery32_2e416m2e208m1/feadd.c
+++ b/src/Specific/montgomery32_2e416m2e208m1/feadd.c
@@ -52,19 +52,19 @@ static void feadd(uint32_t out[13], const uint32_t in1[13], const uint32_t in2[1
   { uint32_t x125; uint8_t x126 = _subborrow_u32(x123, x86, 0xffffffff, &x125);
   { uint32_t x128; uint8_t x129 = _subborrow_u32(x126, x89, 0xffffffff, &x128);
   { uint32_t _; uint8_t x132 = _subborrow_u32(x129, x90, 0x0, &_);
-  { uint32_t x133 = cmovznz(x132, x128, x89);
-  { uint32_t x134 = cmovznz(x132, x125, x86);
-  { uint32_t x135 = cmovznz(x132, x122, x83);
-  { uint32_t x136 = cmovznz(x132, x119, x80);
-  { uint32_t x137 = cmovznz(x132, x116, x77);
-  { uint32_t x138 = cmovznz(x132, x113, x74);
-  { uint32_t x139 = cmovznz(x132, x110, x71);
-  { uint32_t x140 = cmovznz(x132, x107, x68);
-  { uint32_t x141 = cmovznz(x132, x104, x65);
-  { uint32_t x142 = cmovznz(x132, x101, x62);
-  { uint32_t x143 = cmovznz(x132, x98, x59);
-  { uint32_t x144 = cmovznz(x132, x95, x56);
-  { uint32_t x145 = cmovznz(x132, x92, x53);
+  { uint32_t x133 = cmovznz32(x132, x128, x89);
+  { uint32_t x134 = cmovznz32(x132, x125, x86);
+  { uint32_t x135 = cmovznz32(x132, x122, x83);
+  { uint32_t x136 = cmovznz32(x132, x119, x80);
+  { uint32_t x137 = cmovznz32(x132, x116, x77);
+  { uint32_t x138 = cmovznz32(x132, x113, x74);
+  { uint32_t x139 = cmovznz32(x132, x110, x71);
+  { uint32_t x140 = cmovznz32(x132, x107, x68);
+  { uint32_t x141 = cmovznz32(x132, x104, x65);
+  { uint32_t x142 = cmovznz32(x132, x101, x62);
+  { uint32_t x143 = cmovznz32(x132, x98, x59);
+  { uint32_t x144 = cmovznz32(x132, x95, x56);
+  { uint32_t x145 = cmovznz32(x132, x92, x53);
   out[0] = x145;
   out[1] = x144;
   out[2] = x143;
diff --git a/src/Specific/montgomery32_2e416m2e208m1/feaddDisplay.log b/src/Specific/montgomery32_2e416m2e208m1/feaddDisplay.log
index b38023903..de529b044 100644
--- a/src/Specific/montgomery32_2e416m2e208m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e416m2e208m1/feaddDisplay.log
@@ -29,19 +29,19 @@ Interp-η
  uint32_t x125, uint8_t x126 = subborrow_u32(x123, x86, 0xffffffff);
  uint32_t x128, uint8_t x129 = subborrow_u32(x126, x89, 0xffffffff);
  uint32_t _, uint8_t x132 = subborrow_u32(x129, x90, 0x0);
- uint32_t x133 = cmovznz(x132, x128, x89);
- uint32_t x134 = cmovznz(x132, x125, x86);
- uint32_t x135 = cmovznz(x132, x122, x83);
- uint32_t x136 = cmovznz(x132, x119, x80);
- uint32_t x137 = cmovznz(x132, x116, x77);
- uint32_t x138 = cmovznz(x132, x113, x74);
- uint32_t x139 = cmovznz(x132, x110, x71);
- uint32_t x140 = cmovznz(x132, x107, x68);
- uint32_t x141 = cmovznz(x132, x104, x65);
- uint32_t x142 = cmovznz(x132, x101, x62);
- uint32_t x143 = cmovznz(x132, x98, x59);
- uint32_t x144 = cmovznz(x132, x95, x56);
- uint32_t x145 = cmovznz(x132, x92, x53);
+ uint32_t x133 = cmovznz32(x132, x128, x89);
+ uint32_t x134 = cmovznz32(x132, x125, x86);
+ uint32_t x135 = cmovznz32(x132, x122, x83);
+ uint32_t x136 = cmovznz32(x132, x119, x80);
+ uint32_t x137 = cmovznz32(x132, x116, x77);
+ uint32_t x138 = cmovznz32(x132, x113, x74);
+ uint32_t x139 = cmovznz32(x132, x110, x71);
+ uint32_t x140 = cmovznz32(x132, x107, x68);
+ uint32_t x141 = cmovznz32(x132, x104, x65);
+ uint32_t x142 = cmovznz32(x132, x101, x62);
+ uint32_t x143 = cmovznz32(x132, x98, x59);
+ uint32_t x144 = cmovznz32(x132, x95, x56);
+ uint32_t x145 = cmovznz32(x132, x92, x53);
  return (x133, x134, x135, x136, x137, x138, x139, x140, x141, x142, x143, x144, x145))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e444m17/feadd.c b/src/Specific/montgomery32_2e444m17/feadd.c
index 07dfe2dff..27173d59a 100644
--- a/src/Specific/montgomery32_2e444m17/feadd.c
+++ b/src/Specific/montgomery32_2e444m17/feadd.c
@@ -56,20 +56,20 @@ static void feadd(uint32_t out[14], const uint32_t in1[14], const uint32_t in2[1
   { uint32_t x135; uint8_t x136 = _subborrow_u32(x133, x93, 0xffffffff, &x135);
   { uint32_t x138; uint8_t x139 = _subborrow_u32(x136, x96, 0xfffffff, &x138);
   { uint32_t _; uint8_t x142 = _subborrow_u32(x139, x97, 0x0, &_);
-  { uint32_t x143 = cmovznz(x142, x138, x96);
-  { uint32_t x144 = cmovznz(x142, x135, x93);
-  { uint32_t x145 = cmovznz(x142, x132, x90);
-  { uint32_t x146 = cmovznz(x142, x129, x87);
-  { uint32_t x147 = cmovznz(x142, x126, x84);
-  { uint32_t x148 = cmovznz(x142, x123, x81);
-  { uint32_t x149 = cmovznz(x142, x120, x78);
-  { uint32_t x150 = cmovznz(x142, x117, x75);
-  { uint32_t x151 = cmovznz(x142, x114, x72);
-  { uint32_t x152 = cmovznz(x142, x111, x69);
-  { uint32_t x153 = cmovznz(x142, x108, x66);
-  { uint32_t x154 = cmovznz(x142, x105, x63);
-  { uint32_t x155 = cmovznz(x142, x102, x60);
-  { uint32_t x156 = cmovznz(x142, x99, x57);
+  { uint32_t x143 = cmovznz32(x142, x138, x96);
+  { uint32_t x144 = cmovznz32(x142, x135, x93);
+  { uint32_t x145 = cmovznz32(x142, x132, x90);
+  { uint32_t x146 = cmovznz32(x142, x129, x87);
+  { uint32_t x147 = cmovznz32(x142, x126, x84);
+  { uint32_t x148 = cmovznz32(x142, x123, x81);
+  { uint32_t x149 = cmovznz32(x142, x120, x78);
+  { uint32_t x150 = cmovznz32(x142, x117, x75);
+  { uint32_t x151 = cmovznz32(x142, x114, x72);
+  { uint32_t x152 = cmovznz32(x142, x111, x69);
+  { uint32_t x153 = cmovznz32(x142, x108, x66);
+  { uint32_t x154 = cmovznz32(x142, x105, x63);
+  { uint32_t x155 = cmovznz32(x142, x102, x60);
+  { uint32_t x156 = cmovznz32(x142, x99, x57);
   out[0] = x156;
   out[1] = x155;
   out[2] = x154;
diff --git a/src/Specific/montgomery32_2e444m17/feaddDisplay.log b/src/Specific/montgomery32_2e444m17/feaddDisplay.log
index e02798f93..07d9c8b95 100644
--- a/src/Specific/montgomery32_2e444m17/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e444m17/feaddDisplay.log
@@ -31,20 +31,20 @@ Interp-η
  uint32_t x135, uint8_t x136 = subborrow_u32(x133, x93, 0xffffffff);
  uint32_t x138, uint8_t x139 = subborrow_u32(x136, x96, 0xfffffff);
  uint32_t _, uint8_t x142 = subborrow_u32(x139, x97, 0x0);
- uint32_t x143 = cmovznz(x142, x138, x96);
- uint32_t x144 = cmovznz(x142, x135, x93);
- uint32_t x145 = cmovznz(x142, x132, x90);
- uint32_t x146 = cmovznz(x142, x129, x87);
- uint32_t x147 = cmovznz(x142, x126, x84);
- uint32_t x148 = cmovznz(x142, x123, x81);
- uint32_t x149 = cmovznz(x142, x120, x78);
- uint32_t x150 = cmovznz(x142, x117, x75);
- uint32_t x151 = cmovznz(x142, x114, x72);
- uint32_t x152 = cmovznz(x142, x111, x69);
- uint32_t x153 = cmovznz(x142, x108, x66);
- uint32_t x154 = cmovznz(x142, x105, x63);
- uint32_t x155 = cmovznz(x142, x102, x60);
- uint32_t x156 = cmovznz(x142, x99, x57);
+ uint32_t x143 = cmovznz32(x142, x138, x96);
+ uint32_t x144 = cmovznz32(x142, x135, x93);
+ uint32_t x145 = cmovznz32(x142, x132, x90);
+ uint32_t x146 = cmovznz32(x142, x129, x87);
+ uint32_t x147 = cmovznz32(x142, x126, x84);
+ uint32_t x148 = cmovznz32(x142, x123, x81);
+ uint32_t x149 = cmovznz32(x142, x120, x78);
+ uint32_t x150 = cmovznz32(x142, x117, x75);
+ uint32_t x151 = cmovznz32(x142, x114, x72);
+ uint32_t x152 = cmovznz32(x142, x111, x69);
+ uint32_t x153 = cmovznz32(x142, x108, x66);
+ uint32_t x154 = cmovznz32(x142, x105, x63);
+ uint32_t x155 = cmovznz32(x142, x102, x60);
+ uint32_t x156 = cmovznz32(x142, x99, x57);
  return (x143, x144, x145, x146, x147, x148, x149, x150, x151, x152, x153, x154, x155, x156))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e448m2e224m1/feadd.c b/src/Specific/montgomery32_2e448m2e224m1/feadd.c
index 8308e25e9..be0570114 100644
--- a/src/Specific/montgomery32_2e448m2e224m1/feadd.c
+++ b/src/Specific/montgomery32_2e448m2e224m1/feadd.c
@@ -56,20 +56,20 @@ static void feadd(uint32_t out[14], const uint32_t in1[14], const uint32_t in2[1
   { uint32_t x135; uint8_t x136 = _subborrow_u32(x133, x93, 0xffffffff, &x135);
   { uint32_t x138; uint8_t x139 = _subborrow_u32(x136, x96, 0xffffffff, &x138);
   { uint32_t _; uint8_t x142 = _subborrow_u32(x139, x97, 0x0, &_);
-  { uint32_t x143 = cmovznz(x142, x138, x96);
-  { uint32_t x144 = cmovznz(x142, x135, x93);
-  { uint32_t x145 = cmovznz(x142, x132, x90);
-  { uint32_t x146 = cmovznz(x142, x129, x87);
-  { uint32_t x147 = cmovznz(x142, x126, x84);
-  { uint32_t x148 = cmovznz(x142, x123, x81);
-  { uint32_t x149 = cmovznz(x142, x120, x78);
-  { uint32_t x150 = cmovznz(x142, x117, x75);
-  { uint32_t x151 = cmovznz(x142, x114, x72);
-  { uint32_t x152 = cmovznz(x142, x111, x69);
-  { uint32_t x153 = cmovznz(x142, x108, x66);
-  { uint32_t x154 = cmovznz(x142, x105, x63);
-  { uint32_t x155 = cmovznz(x142, x102, x60);
-  { uint32_t x156 = cmovznz(x142, x99, x57);
+  { uint32_t x143 = cmovznz32(x142, x138, x96);
+  { uint32_t x144 = cmovznz32(x142, x135, x93);
+  { uint32_t x145 = cmovznz32(x142, x132, x90);
+  { uint32_t x146 = cmovznz32(x142, x129, x87);
+  { uint32_t x147 = cmovznz32(x142, x126, x84);
+  { uint32_t x148 = cmovznz32(x142, x123, x81);
+  { uint32_t x149 = cmovznz32(x142, x120, x78);
+  { uint32_t x150 = cmovznz32(x142, x117, x75);
+  { uint32_t x151 = cmovznz32(x142, x114, x72);
+  { uint32_t x152 = cmovznz32(x142, x111, x69);
+  { uint32_t x153 = cmovznz32(x142, x108, x66);
+  { uint32_t x154 = cmovznz32(x142, x105, x63);
+  { uint32_t x155 = cmovznz32(x142, x102, x60);
+  { uint32_t x156 = cmovznz32(x142, x99, x57);
   out[0] = x156;
   out[1] = x155;
   out[2] = x154;
diff --git a/src/Specific/montgomery32_2e448m2e224m1/feaddDisplay.log b/src/Specific/montgomery32_2e448m2e224m1/feaddDisplay.log
index 369545ff6..71a9485c1 100644
--- a/src/Specific/montgomery32_2e448m2e224m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e448m2e224m1/feaddDisplay.log
@@ -31,20 +31,20 @@ Interp-η
  uint32_t x135, uint8_t x136 = subborrow_u32(x133, x93, 0xffffffff);
  uint32_t x138, uint8_t x139 = subborrow_u32(x136, x96, 0xffffffff);
  uint32_t _, uint8_t x142 = subborrow_u32(x139, x97, 0x0);
- uint32_t x143 = cmovznz(x142, x138, x96);
- uint32_t x144 = cmovznz(x142, x135, x93);
- uint32_t x145 = cmovznz(x142, x132, x90);
- uint32_t x146 = cmovznz(x142, x129, x87);
- uint32_t x147 = cmovznz(x142, x126, x84);
- uint32_t x148 = cmovznz(x142, x123, x81);
- uint32_t x149 = cmovznz(x142, x120, x78);
- uint32_t x150 = cmovznz(x142, x117, x75);
- uint32_t x151 = cmovznz(x142, x114, x72);
- uint32_t x152 = cmovznz(x142, x111, x69);
- uint32_t x153 = cmovznz(x142, x108, x66);
- uint32_t x154 = cmovznz(x142, x105, x63);
- uint32_t x155 = cmovznz(x142, x102, x60);
- uint32_t x156 = cmovznz(x142, x99, x57);
+ uint32_t x143 = cmovznz32(x142, x138, x96);
+ uint32_t x144 = cmovznz32(x142, x135, x93);
+ uint32_t x145 = cmovznz32(x142, x132, x90);
+ uint32_t x146 = cmovznz32(x142, x129, x87);
+ uint32_t x147 = cmovznz32(x142, x126, x84);
+ uint32_t x148 = cmovznz32(x142, x123, x81);
+ uint32_t x149 = cmovznz32(x142, x120, x78);
+ uint32_t x150 = cmovznz32(x142, x117, x75);
+ uint32_t x151 = cmovznz32(x142, x114, x72);
+ uint32_t x152 = cmovznz32(x142, x111, x69);
+ uint32_t x153 = cmovznz32(x142, x108, x66);
+ uint32_t x154 = cmovznz32(x142, x105, x63);
+ uint32_t x155 = cmovznz32(x142, x102, x60);
+ uint32_t x156 = cmovznz32(x142, x99, x57);
  return (x143, x144, x145, x146, x147, x148, x149, x150, x151, x152, x153, x154, x155, x156))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e450m2e225m1/feadd.c b/src/Specific/montgomery32_2e450m2e225m1/feadd.c
index 64f201c18..3fad66efb 100644
--- a/src/Specific/montgomery32_2e450m2e225m1/feadd.c
+++ b/src/Specific/montgomery32_2e450m2e225m1/feadd.c
@@ -60,21 +60,21 @@ static void feadd(uint32_t out[15], const uint32_t in1[15], const uint32_t in2[1
   { uint32_t x145; uint8_t x146 = _subborrow_u32(x143, x100, 0xffffffff, &x145);
   { uint32_t x148; uint8_t x149 = _subborrow_u32(x146, x103, 0x3, &x148);
   { uint32_t _; uint8_t x152 = _subborrow_u32(x149, x104, 0x0, &_);
-  { uint32_t x153 = cmovznz(x152, x148, x103);
-  { uint32_t x154 = cmovznz(x152, x145, x100);
-  { uint32_t x155 = cmovznz(x152, x142, x97);
-  { uint32_t x156 = cmovznz(x152, x139, x94);
-  { uint32_t x157 = cmovznz(x152, x136, x91);
-  { uint32_t x158 = cmovznz(x152, x133, x88);
-  { uint32_t x159 = cmovznz(x152, x130, x85);
-  { uint32_t x160 = cmovznz(x152, x127, x82);
-  { uint32_t x161 = cmovznz(x152, x124, x79);
-  { uint32_t x162 = cmovznz(x152, x121, x76);
-  { uint32_t x163 = cmovznz(x152, x118, x73);
-  { uint32_t x164 = cmovznz(x152, x115, x70);
-  { uint32_t x165 = cmovznz(x152, x112, x67);
-  { uint32_t x166 = cmovznz(x152, x109, x64);
-  { uint32_t x167 = cmovznz(x152, x106, x61);
+  { uint32_t x153 = cmovznz32(x152, x148, x103);
+  { uint32_t x154 = cmovznz32(x152, x145, x100);
+  { uint32_t x155 = cmovznz32(x152, x142, x97);
+  { uint32_t x156 = cmovznz32(x152, x139, x94);
+  { uint32_t x157 = cmovznz32(x152, x136, x91);
+  { uint32_t x158 = cmovznz32(x152, x133, x88);
+  { uint32_t x159 = cmovznz32(x152, x130, x85);
+  { uint32_t x160 = cmovznz32(x152, x127, x82);
+  { uint32_t x161 = cmovznz32(x152, x124, x79);
+  { uint32_t x162 = cmovznz32(x152, x121, x76);
+  { uint32_t x163 = cmovznz32(x152, x118, x73);
+  { uint32_t x164 = cmovznz32(x152, x115, x70);
+  { uint32_t x165 = cmovznz32(x152, x112, x67);
+  { uint32_t x166 = cmovznz32(x152, x109, x64);
+  { uint32_t x167 = cmovznz32(x152, x106, x61);
   out[0] = x167;
   out[1] = x166;
   out[2] = x165;
diff --git a/src/Specific/montgomery32_2e450m2e225m1/feaddDisplay.log b/src/Specific/montgomery32_2e450m2e225m1/feaddDisplay.log
index 6b9099a4d..5315b7fe3 100644
--- a/src/Specific/montgomery32_2e450m2e225m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e450m2e225m1/feaddDisplay.log
@@ -33,21 +33,21 @@ Interp-η
  uint32_t x145, uint8_t x146 = subborrow_u32(x143, x100, 0xffffffff);
  uint32_t x148, uint8_t x149 = subborrow_u32(x146, x103, 0x3);
  uint32_t _, uint8_t x152 = subborrow_u32(x149, x104, 0x0);
- uint32_t x153 = cmovznz(x152, x148, x103);
- uint32_t x154 = cmovznz(x152, x145, x100);
- uint32_t x155 = cmovznz(x152, x142, x97);
- uint32_t x156 = cmovznz(x152, x139, x94);
- uint32_t x157 = cmovznz(x152, x136, x91);
- uint32_t x158 = cmovznz(x152, x133, x88);
- uint32_t x159 = cmovznz(x152, x130, x85);
- uint32_t x160 = cmovznz(x152, x127, x82);
- uint32_t x161 = cmovznz(x152, x124, x79);
- uint32_t x162 = cmovznz(x152, x121, x76);
- uint32_t x163 = cmovznz(x152, x118, x73);
- uint32_t x164 = cmovznz(x152, x115, x70);
- uint32_t x165 = cmovznz(x152, x112, x67);
- uint32_t x166 = cmovznz(x152, x109, x64);
- uint32_t x167 = cmovznz(x152, x106, x61);
+ uint32_t x153 = cmovznz32(x152, x148, x103);
+ uint32_t x154 = cmovznz32(x152, x145, x100);
+ uint32_t x155 = cmovznz32(x152, x142, x97);
+ uint32_t x156 = cmovznz32(x152, x139, x94);
+ uint32_t x157 = cmovznz32(x152, x136, x91);
+ uint32_t x158 = cmovznz32(x152, x133, x88);
+ uint32_t x159 = cmovznz32(x152, x130, x85);
+ uint32_t x160 = cmovznz32(x152, x127, x82);
+ uint32_t x161 = cmovznz32(x152, x124, x79);
+ uint32_t x162 = cmovznz32(x152, x121, x76);
+ uint32_t x163 = cmovznz32(x152, x118, x73);
+ uint32_t x164 = cmovznz32(x152, x115, x70);
+ uint32_t x165 = cmovznz32(x152, x112, x67);
+ uint32_t x166 = cmovznz32(x152, x109, x64);
+ uint32_t x167 = cmovznz32(x152, x106, x61);
  return (x153, x154, x155, x156, x157, x158, x159, x160, x161, x162, x163, x164, x165, x166, x167))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e452m3/feadd.c b/src/Specific/montgomery32_2e452m3/feadd.c
index dfd707107..d9de15f48 100644
--- a/src/Specific/montgomery32_2e452m3/feadd.c
+++ b/src/Specific/montgomery32_2e452m3/feadd.c
@@ -60,21 +60,21 @@ static void feadd(uint32_t out[15], const uint32_t in1[15], const uint32_t in2[1
   { uint32_t x145; uint8_t x146 = _subborrow_u32(x143, x100, 0xffffffff, &x145);
   { uint32_t x148; uint8_t x149 = _subborrow_u32(x146, x103, 0xf, &x148);
   { uint32_t _; uint8_t x152 = _subborrow_u32(x149, x104, 0x0, &_);
-  { uint32_t x153 = cmovznz(x152, x148, x103);
-  { uint32_t x154 = cmovznz(x152, x145, x100);
-  { uint32_t x155 = cmovznz(x152, x142, x97);
-  { uint32_t x156 = cmovznz(x152, x139, x94);
-  { uint32_t x157 = cmovznz(x152, x136, x91);
-  { uint32_t x158 = cmovznz(x152, x133, x88);
-  { uint32_t x159 = cmovznz(x152, x130, x85);
-  { uint32_t x160 = cmovznz(x152, x127, x82);
-  { uint32_t x161 = cmovznz(x152, x124, x79);
-  { uint32_t x162 = cmovznz(x152, x121, x76);
-  { uint32_t x163 = cmovznz(x152, x118, x73);
-  { uint32_t x164 = cmovznz(x152, x115, x70);
-  { uint32_t x165 = cmovznz(x152, x112, x67);
-  { uint32_t x166 = cmovznz(x152, x109, x64);
-  { uint32_t x167 = cmovznz(x152, x106, x61);
+  { uint32_t x153 = cmovznz32(x152, x148, x103);
+  { uint32_t x154 = cmovznz32(x152, x145, x100);
+  { uint32_t x155 = cmovznz32(x152, x142, x97);
+  { uint32_t x156 = cmovznz32(x152, x139, x94);
+  { uint32_t x157 = cmovznz32(x152, x136, x91);
+  { uint32_t x158 = cmovznz32(x152, x133, x88);
+  { uint32_t x159 = cmovznz32(x152, x130, x85);
+  { uint32_t x160 = cmovznz32(x152, x127, x82);
+  { uint32_t x161 = cmovznz32(x152, x124, x79);
+  { uint32_t x162 = cmovznz32(x152, x121, x76);
+  { uint32_t x163 = cmovznz32(x152, x118, x73);
+  { uint32_t x164 = cmovznz32(x152, x115, x70);
+  { uint32_t x165 = cmovznz32(x152, x112, x67);
+  { uint32_t x166 = cmovznz32(x152, x109, x64);
+  { uint32_t x167 = cmovznz32(x152, x106, x61);
   out[0] = x167;
   out[1] = x166;
   out[2] = x165;
diff --git a/src/Specific/montgomery32_2e452m3/feaddDisplay.log b/src/Specific/montgomery32_2e452m3/feaddDisplay.log
index 702405c99..853ad2718 100644
--- a/src/Specific/montgomery32_2e452m3/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e452m3/feaddDisplay.log
@@ -33,21 +33,21 @@ Interp-η
  uint32_t x145, uint8_t x146 = subborrow_u32(x143, x100, 0xffffffff);
  uint32_t x148, uint8_t x149 = subborrow_u32(x146, x103, 0xf);
  uint32_t _, uint8_t x152 = subborrow_u32(x149, x104, 0x0);
- uint32_t x153 = cmovznz(x152, x148, x103);
- uint32_t x154 = cmovznz(x152, x145, x100);
- uint32_t x155 = cmovznz(x152, x142, x97);
- uint32_t x156 = cmovznz(x152, x139, x94);
- uint32_t x157 = cmovznz(x152, x136, x91);
- uint32_t x158 = cmovznz(x152, x133, x88);
- uint32_t x159 = cmovznz(x152, x130, x85);
- uint32_t x160 = cmovznz(x152, x127, x82);
- uint32_t x161 = cmovznz(x152, x124, x79);
- uint32_t x162 = cmovznz(x152, x121, x76);
- uint32_t x163 = cmovznz(x152, x118, x73);
- uint32_t x164 = cmovznz(x152, x115, x70);
- uint32_t x165 = cmovznz(x152, x112, x67);
- uint32_t x166 = cmovznz(x152, x109, x64);
- uint32_t x167 = cmovznz(x152, x106, x61);
+ uint32_t x153 = cmovznz32(x152, x148, x103);
+ uint32_t x154 = cmovznz32(x152, x145, x100);
+ uint32_t x155 = cmovznz32(x152, x142, x97);
+ uint32_t x156 = cmovznz32(x152, x139, x94);
+ uint32_t x157 = cmovznz32(x152, x136, x91);
+ uint32_t x158 = cmovznz32(x152, x133, x88);
+ uint32_t x159 = cmovznz32(x152, x130, x85);
+ uint32_t x160 = cmovznz32(x152, x127, x82);
+ uint32_t x161 = cmovznz32(x152, x124, x79);
+ uint32_t x162 = cmovznz32(x152, x121, x76);
+ uint32_t x163 = cmovznz32(x152, x118, x73);
+ uint32_t x164 = cmovznz32(x152, x115, x70);
+ uint32_t x165 = cmovznz32(x152, x112, x67);
+ uint32_t x166 = cmovznz32(x152, x109, x64);
+ uint32_t x167 = cmovznz32(x152, x106, x61);
  return (x153, x154, x155, x156, x157, x158, x159, x160, x161, x162, x163, x164, x165, x166, x167))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e468m17/feadd.c b/src/Specific/montgomery32_2e468m17/feadd.c
index 2c479bbc3..0ca8876bd 100644
--- a/src/Specific/montgomery32_2e468m17/feadd.c
+++ b/src/Specific/montgomery32_2e468m17/feadd.c
@@ -60,21 +60,21 @@ static void feadd(uint32_t out[15], const uint32_t in1[15], const uint32_t in2[1
   { uint32_t x145; uint8_t x146 = _subborrow_u32(x143, x100, 0xffffffff, &x145);
   { uint32_t x148; uint8_t x149 = _subborrow_u32(x146, x103, 0xfffff, &x148);
   { uint32_t _; uint8_t x152 = _subborrow_u32(x149, x104, 0x0, &_);
-  { uint32_t x153 = cmovznz(x152, x148, x103);
-  { uint32_t x154 = cmovznz(x152, x145, x100);
-  { uint32_t x155 = cmovznz(x152, x142, x97);
-  { uint32_t x156 = cmovznz(x152, x139, x94);
-  { uint32_t x157 = cmovznz(x152, x136, x91);
-  { uint32_t x158 = cmovznz(x152, x133, x88);
-  { uint32_t x159 = cmovznz(x152, x130, x85);
-  { uint32_t x160 = cmovznz(x152, x127, x82);
-  { uint32_t x161 = cmovznz(x152, x124, x79);
-  { uint32_t x162 = cmovznz(x152, x121, x76);
-  { uint32_t x163 = cmovznz(x152, x118, x73);
-  { uint32_t x164 = cmovznz(x152, x115, x70);
-  { uint32_t x165 = cmovznz(x152, x112, x67);
-  { uint32_t x166 = cmovznz(x152, x109, x64);
-  { uint32_t x167 = cmovznz(x152, x106, x61);
+  { uint32_t x153 = cmovznz32(x152, x148, x103);
+  { uint32_t x154 = cmovznz32(x152, x145, x100);
+  { uint32_t x155 = cmovznz32(x152, x142, x97);
+  { uint32_t x156 = cmovznz32(x152, x139, x94);
+  { uint32_t x157 = cmovznz32(x152, x136, x91);
+  { uint32_t x158 = cmovznz32(x152, x133, x88);
+  { uint32_t x159 = cmovznz32(x152, x130, x85);
+  { uint32_t x160 = cmovznz32(x152, x127, x82);
+  { uint32_t x161 = cmovznz32(x152, x124, x79);
+  { uint32_t x162 = cmovznz32(x152, x121, x76);
+  { uint32_t x163 = cmovznz32(x152, x118, x73);
+  { uint32_t x164 = cmovznz32(x152, x115, x70);
+  { uint32_t x165 = cmovznz32(x152, x112, x67);
+  { uint32_t x166 = cmovznz32(x152, x109, x64);
+  { uint32_t x167 = cmovznz32(x152, x106, x61);
   out[0] = x167;
   out[1] = x166;
   out[2] = x165;
diff --git a/src/Specific/montgomery32_2e468m17/feaddDisplay.log b/src/Specific/montgomery32_2e468m17/feaddDisplay.log
index 7345bfdc7..49636caac 100644
--- a/src/Specific/montgomery32_2e468m17/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e468m17/feaddDisplay.log
@@ -33,21 +33,21 @@ Interp-η
  uint32_t x145, uint8_t x146 = subborrow_u32(x143, x100, 0xffffffff);
  uint32_t x148, uint8_t x149 = subborrow_u32(x146, x103, 0xfffff);
  uint32_t _, uint8_t x152 = subborrow_u32(x149, x104, 0x0);
- uint32_t x153 = cmovznz(x152, x148, x103);
- uint32_t x154 = cmovznz(x152, x145, x100);
- uint32_t x155 = cmovznz(x152, x142, x97);
- uint32_t x156 = cmovznz(x152, x139, x94);
- uint32_t x157 = cmovznz(x152, x136, x91);
- uint32_t x158 = cmovznz(x152, x133, x88);
- uint32_t x159 = cmovznz(x152, x130, x85);
- uint32_t x160 = cmovznz(x152, x127, x82);
- uint32_t x161 = cmovznz(x152, x124, x79);
- uint32_t x162 = cmovznz(x152, x121, x76);
- uint32_t x163 = cmovznz(x152, x118, x73);
- uint32_t x164 = cmovznz(x152, x115, x70);
- uint32_t x165 = cmovznz(x152, x112, x67);
- uint32_t x166 = cmovznz(x152, x109, x64);
- uint32_t x167 = cmovznz(x152, x106, x61);
+ uint32_t x153 = cmovznz32(x152, x148, x103);
+ uint32_t x154 = cmovznz32(x152, x145, x100);
+ uint32_t x155 = cmovznz32(x152, x142, x97);
+ uint32_t x156 = cmovznz32(x152, x139, x94);
+ uint32_t x157 = cmovznz32(x152, x136, x91);
+ uint32_t x158 = cmovznz32(x152, x133, x88);
+ uint32_t x159 = cmovznz32(x152, x130, x85);
+ uint32_t x160 = cmovznz32(x152, x127, x82);
+ uint32_t x161 = cmovznz32(x152, x124, x79);
+ uint32_t x162 = cmovznz32(x152, x121, x76);
+ uint32_t x163 = cmovznz32(x152, x118, x73);
+ uint32_t x164 = cmovznz32(x152, x115, x70);
+ uint32_t x165 = cmovznz32(x152, x112, x67);
+ uint32_t x166 = cmovznz32(x152, x109, x64);
+ uint32_t x167 = cmovznz32(x152, x106, x61);
  return (x153, x154, x155, x156, x157, x158, x159, x160, x161, x162, x163, x164, x165, x166, x167))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e480m2e240m1/feadd.c b/src/Specific/montgomery32_2e480m2e240m1/feadd.c
index 8ac24dff0..d56ddb00f 100644
--- a/src/Specific/montgomery32_2e480m2e240m1/feadd.c
+++ b/src/Specific/montgomery32_2e480m2e240m1/feadd.c
@@ -60,21 +60,21 @@ static void feadd(uint32_t out[15], const uint32_t in1[15], const uint32_t in2[1
   { uint32_t x145; uint8_t x146 = _subborrow_u32(x143, x100, 0xffffffff, &x145);
   { uint32_t x148; uint8_t x149 = _subborrow_u32(x146, x103, 0xffffffff, &x148);
   { uint32_t _; uint8_t x152 = _subborrow_u32(x149, x104, 0x0, &_);
-  { uint32_t x153 = cmovznz(x152, x148, x103);
-  { uint32_t x154 = cmovznz(x152, x145, x100);
-  { uint32_t x155 = cmovznz(x152, x142, x97);
-  { uint32_t x156 = cmovznz(x152, x139, x94);
-  { uint32_t x157 = cmovznz(x152, x136, x91);
-  { uint32_t x158 = cmovznz(x152, x133, x88);
-  { uint32_t x159 = cmovznz(x152, x130, x85);
-  { uint32_t x160 = cmovznz(x152, x127, x82);
-  { uint32_t x161 = cmovznz(x152, x124, x79);
-  { uint32_t x162 = cmovznz(x152, x121, x76);
-  { uint32_t x163 = cmovznz(x152, x118, x73);
-  { uint32_t x164 = cmovznz(x152, x115, x70);
-  { uint32_t x165 = cmovznz(x152, x112, x67);
-  { uint32_t x166 = cmovznz(x152, x109, x64);
-  { uint32_t x167 = cmovznz(x152, x106, x61);
+  { uint32_t x153 = cmovznz32(x152, x148, x103);
+  { uint32_t x154 = cmovznz32(x152, x145, x100);
+  { uint32_t x155 = cmovznz32(x152, x142, x97);
+  { uint32_t x156 = cmovznz32(x152, x139, x94);
+  { uint32_t x157 = cmovznz32(x152, x136, x91);
+  { uint32_t x158 = cmovznz32(x152, x133, x88);
+  { uint32_t x159 = cmovznz32(x152, x130, x85);
+  { uint32_t x160 = cmovznz32(x152, x127, x82);
+  { uint32_t x161 = cmovznz32(x152, x124, x79);
+  { uint32_t x162 = cmovznz32(x152, x121, x76);
+  { uint32_t x163 = cmovznz32(x152, x118, x73);
+  { uint32_t x164 = cmovznz32(x152, x115, x70);
+  { uint32_t x165 = cmovznz32(x152, x112, x67);
+  { uint32_t x166 = cmovznz32(x152, x109, x64);
+  { uint32_t x167 = cmovznz32(x152, x106, x61);
   out[0] = x167;
   out[1] = x166;
   out[2] = x165;
diff --git a/src/Specific/montgomery32_2e480m2e240m1/feaddDisplay.log b/src/Specific/montgomery32_2e480m2e240m1/feaddDisplay.log
index 40fd2389b..89d8ec5de 100644
--- a/src/Specific/montgomery32_2e480m2e240m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e480m2e240m1/feaddDisplay.log
@@ -33,21 +33,21 @@ Interp-η
  uint32_t x145, uint8_t x146 = subborrow_u32(x143, x100, 0xffffffff);
  uint32_t x148, uint8_t x149 = subborrow_u32(x146, x103, 0xffffffff);
  uint32_t _, uint8_t x152 = subborrow_u32(x149, x104, 0x0);
- uint32_t x153 = cmovznz(x152, x148, x103);
- uint32_t x154 = cmovznz(x152, x145, x100);
- uint32_t x155 = cmovznz(x152, x142, x97);
- uint32_t x156 = cmovznz(x152, x139, x94);
- uint32_t x157 = cmovznz(x152, x136, x91);
- uint32_t x158 = cmovznz(x152, x133, x88);
- uint32_t x159 = cmovznz(x152, x130, x85);
- uint32_t x160 = cmovznz(x152, x127, x82);
- uint32_t x161 = cmovznz(x152, x124, x79);
- uint32_t x162 = cmovznz(x152, x121, x76);
- uint32_t x163 = cmovznz(x152, x118, x73);
- uint32_t x164 = cmovznz(x152, x115, x70);
- uint32_t x165 = cmovznz(x152, x112, x67);
- uint32_t x166 = cmovznz(x152, x109, x64);
- uint32_t x167 = cmovznz(x152, x106, x61);
+ uint32_t x153 = cmovznz32(x152, x148, x103);
+ uint32_t x154 = cmovznz32(x152, x145, x100);
+ uint32_t x155 = cmovznz32(x152, x142, x97);
+ uint32_t x156 = cmovznz32(x152, x139, x94);
+ uint32_t x157 = cmovznz32(x152, x136, x91);
+ uint32_t x158 = cmovznz32(x152, x133, x88);
+ uint32_t x159 = cmovznz32(x152, x130, x85);
+ uint32_t x160 = cmovznz32(x152, x127, x82);
+ uint32_t x161 = cmovznz32(x152, x124, x79);
+ uint32_t x162 = cmovznz32(x152, x121, x76);
+ uint32_t x163 = cmovznz32(x152, x118, x73);
+ uint32_t x164 = cmovznz32(x152, x115, x70);
+ uint32_t x165 = cmovznz32(x152, x112, x67);
+ uint32_t x166 = cmovznz32(x152, x109, x64);
+ uint32_t x167 = cmovznz32(x152, x106, x61);
  return (x153, x154, x155, x156, x157, x158, x159, x160, x161, x162, x163, x164, x165, x166, x167))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e488m17/feadd.c b/src/Specific/montgomery32_2e488m17/feadd.c
index 73329fa32..302b84c35 100644
--- a/src/Specific/montgomery32_2e488m17/feadd.c
+++ b/src/Specific/montgomery32_2e488m17/feadd.c
@@ -64,22 +64,22 @@ static void feadd(uint32_t out[16], const uint32_t in1[16], const uint32_t in2[1
   { uint32_t x155; uint8_t x156 = _subborrow_u32(x153, x107, 0xffffffff, &x155);
   { uint32_t x158; uint8_t x159 = _subborrow_u32(x156, x110, 0xff, &x158);
   { uint32_t _; uint8_t x162 = _subborrow_u32(x159, x111, 0x0, &_);
-  { uint32_t x163 = cmovznz(x162, x158, x110);
-  { uint32_t x164 = cmovznz(x162, x155, x107);
-  { uint32_t x165 = cmovznz(x162, x152, x104);
-  { uint32_t x166 = cmovznz(x162, x149, x101);
-  { uint32_t x167 = cmovznz(x162, x146, x98);
-  { uint32_t x168 = cmovznz(x162, x143, x95);
-  { uint32_t x169 = cmovznz(x162, x140, x92);
-  { uint32_t x170 = cmovznz(x162, x137, x89);
-  { uint32_t x171 = cmovznz(x162, x134, x86);
-  { uint32_t x172 = cmovznz(x162, x131, x83);
-  { uint32_t x173 = cmovznz(x162, x128, x80);
-  { uint32_t x174 = cmovznz(x162, x125, x77);
-  { uint32_t x175 = cmovznz(x162, x122, x74);
-  { uint32_t x176 = cmovznz(x162, x119, x71);
-  { uint32_t x177 = cmovznz(x162, x116, x68);
-  { uint32_t x178 = cmovznz(x162, x113, x65);
+  { uint32_t x163 = cmovznz32(x162, x158, x110);
+  { uint32_t x164 = cmovznz32(x162, x155, x107);
+  { uint32_t x165 = cmovznz32(x162, x152, x104);
+  { uint32_t x166 = cmovznz32(x162, x149, x101);
+  { uint32_t x167 = cmovznz32(x162, x146, x98);
+  { uint32_t x168 = cmovznz32(x162, x143, x95);
+  { uint32_t x169 = cmovznz32(x162, x140, x92);
+  { uint32_t x170 = cmovznz32(x162, x137, x89);
+  { uint32_t x171 = cmovznz32(x162, x134, x86);
+  { uint32_t x172 = cmovznz32(x162, x131, x83);
+  { uint32_t x173 = cmovznz32(x162, x128, x80);
+  { uint32_t x174 = cmovznz32(x162, x125, x77);
+  { uint32_t x175 = cmovznz32(x162, x122, x74);
+  { uint32_t x176 = cmovznz32(x162, x119, x71);
+  { uint32_t x177 = cmovznz32(x162, x116, x68);
+  { uint32_t x178 = cmovznz32(x162, x113, x65);
   out[0] = x178;
   out[1] = x177;
   out[2] = x176;
diff --git a/src/Specific/montgomery32_2e488m17/feaddDisplay.log b/src/Specific/montgomery32_2e488m17/feaddDisplay.log
index 415e02848..d29341a8b 100644
--- a/src/Specific/montgomery32_2e488m17/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e488m17/feaddDisplay.log
@@ -35,22 +35,22 @@ Interp-η
  uint32_t x155, uint8_t x156 = subborrow_u32(x153, x107, 0xffffffff);
  uint32_t x158, uint8_t x159 = subborrow_u32(x156, x110, 0xff);
  uint32_t _, uint8_t x162 = subborrow_u32(x159, x111, 0x0);
- uint32_t x163 = cmovznz(x162, x158, x110);
- uint32_t x164 = cmovznz(x162, x155, x107);
- uint32_t x165 = cmovznz(x162, x152, x104);
- uint32_t x166 = cmovznz(x162, x149, x101);
- uint32_t x167 = cmovznz(x162, x146, x98);
- uint32_t x168 = cmovznz(x162, x143, x95);
- uint32_t x169 = cmovznz(x162, x140, x92);
- uint32_t x170 = cmovznz(x162, x137, x89);
- uint32_t x171 = cmovznz(x162, x134, x86);
- uint32_t x172 = cmovznz(x162, x131, x83);
- uint32_t x173 = cmovznz(x162, x128, x80);
- uint32_t x174 = cmovznz(x162, x125, x77);
- uint32_t x175 = cmovznz(x162, x122, x74);
- uint32_t x176 = cmovznz(x162, x119, x71);
- uint32_t x177 = cmovznz(x162, x116, x68);
- uint32_t x178 = cmovznz(x162, x113, x65);
+ uint32_t x163 = cmovznz32(x162, x158, x110);
+ uint32_t x164 = cmovznz32(x162, x155, x107);
+ uint32_t x165 = cmovznz32(x162, x152, x104);
+ uint32_t x166 = cmovznz32(x162, x149, x101);
+ uint32_t x167 = cmovznz32(x162, x146, x98);
+ uint32_t x168 = cmovznz32(x162, x143, x95);
+ uint32_t x169 = cmovznz32(x162, x140, x92);
+ uint32_t x170 = cmovznz32(x162, x137, x89);
+ uint32_t x171 = cmovznz32(x162, x134, x86);
+ uint32_t x172 = cmovznz32(x162, x131, x83);
+ uint32_t x173 = cmovznz32(x162, x128, x80);
+ uint32_t x174 = cmovznz32(x162, x125, x77);
+ uint32_t x175 = cmovznz32(x162, x122, x74);
+ uint32_t x176 = cmovznz32(x162, x119, x71);
+ uint32_t x177 = cmovznz32(x162, x116, x68);
+ uint32_t x178 = cmovznz32(x162, x113, x65);
  return (x163, x164, x165, x166, x167, x168, x169, x170, x171, x172, x173, x174, x175, x176, x177, x178))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e489m21/feadd.c b/src/Specific/montgomery32_2e489m21/feadd.c
index 453317b36..007a47660 100644
--- a/src/Specific/montgomery32_2e489m21/feadd.c
+++ b/src/Specific/montgomery32_2e489m21/feadd.c
@@ -64,22 +64,22 @@ static void feadd(uint32_t out[16], const uint32_t in1[16], const uint32_t in2[1
   { uint32_t x155; uint8_t x156 = _subborrow_u32(x153, x107, 0xffffffff, &x155);
   { uint32_t x158; uint8_t x159 = _subborrow_u32(x156, x110, 0x1ff, &x158);
   { uint32_t _; uint8_t x162 = _subborrow_u32(x159, x111, 0x0, &_);
-  { uint32_t x163 = cmovznz(x162, x158, x110);
-  { uint32_t x164 = cmovznz(x162, x155, x107);
-  { uint32_t x165 = cmovznz(x162, x152, x104);
-  { uint32_t x166 = cmovznz(x162, x149, x101);
-  { uint32_t x167 = cmovznz(x162, x146, x98);
-  { uint32_t x168 = cmovznz(x162, x143, x95);
-  { uint32_t x169 = cmovznz(x162, x140, x92);
-  { uint32_t x170 = cmovznz(x162, x137, x89);
-  { uint32_t x171 = cmovznz(x162, x134, x86);
-  { uint32_t x172 = cmovznz(x162, x131, x83);
-  { uint32_t x173 = cmovznz(x162, x128, x80);
-  { uint32_t x174 = cmovznz(x162, x125, x77);
-  { uint32_t x175 = cmovznz(x162, x122, x74);
-  { uint32_t x176 = cmovznz(x162, x119, x71);
-  { uint32_t x177 = cmovznz(x162, x116, x68);
-  { uint32_t x178 = cmovznz(x162, x113, x65);
+  { uint32_t x163 = cmovznz32(x162, x158, x110);
+  { uint32_t x164 = cmovznz32(x162, x155, x107);
+  { uint32_t x165 = cmovznz32(x162, x152, x104);
+  { uint32_t x166 = cmovznz32(x162, x149, x101);
+  { uint32_t x167 = cmovznz32(x162, x146, x98);
+  { uint32_t x168 = cmovznz32(x162, x143, x95);
+  { uint32_t x169 = cmovznz32(x162, x140, x92);
+  { uint32_t x170 = cmovznz32(x162, x137, x89);
+  { uint32_t x171 = cmovznz32(x162, x134, x86);
+  { uint32_t x172 = cmovznz32(x162, x131, x83);
+  { uint32_t x173 = cmovznz32(x162, x128, x80);
+  { uint32_t x174 = cmovznz32(x162, x125, x77);
+  { uint32_t x175 = cmovznz32(x162, x122, x74);
+  { uint32_t x176 = cmovznz32(x162, x119, x71);
+  { uint32_t x177 = cmovznz32(x162, x116, x68);
+  { uint32_t x178 = cmovznz32(x162, x113, x65);
   out[0] = x178;
   out[1] = x177;
   out[2] = x176;
diff --git a/src/Specific/montgomery32_2e489m21/feaddDisplay.log b/src/Specific/montgomery32_2e489m21/feaddDisplay.log
index e95c819e9..bb1861938 100644
--- a/src/Specific/montgomery32_2e489m21/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e489m21/feaddDisplay.log
@@ -35,22 +35,22 @@ Interp-η
  uint32_t x155, uint8_t x156 = subborrow_u32(x153, x107, 0xffffffff);
  uint32_t x158, uint8_t x159 = subborrow_u32(x156, x110, 0x1ff);
  uint32_t _, uint8_t x162 = subborrow_u32(x159, x111, 0x0);
- uint32_t x163 = cmovznz(x162, x158, x110);
- uint32_t x164 = cmovznz(x162, x155, x107);
- uint32_t x165 = cmovznz(x162, x152, x104);
- uint32_t x166 = cmovznz(x162, x149, x101);
- uint32_t x167 = cmovznz(x162, x146, x98);
- uint32_t x168 = cmovznz(x162, x143, x95);
- uint32_t x169 = cmovznz(x162, x140, x92);
- uint32_t x170 = cmovznz(x162, x137, x89);
- uint32_t x171 = cmovznz(x162, x134, x86);
- uint32_t x172 = cmovznz(x162, x131, x83);
- uint32_t x173 = cmovznz(x162, x128, x80);
- uint32_t x174 = cmovznz(x162, x125, x77);
- uint32_t x175 = cmovznz(x162, x122, x74);
- uint32_t x176 = cmovznz(x162, x119, x71);
- uint32_t x177 = cmovznz(x162, x116, x68);
- uint32_t x178 = cmovznz(x162, x113, x65);
+ uint32_t x163 = cmovznz32(x162, x158, x110);
+ uint32_t x164 = cmovznz32(x162, x155, x107);
+ uint32_t x165 = cmovznz32(x162, x152, x104);
+ uint32_t x166 = cmovznz32(x162, x149, x101);
+ uint32_t x167 = cmovznz32(x162, x146, x98);
+ uint32_t x168 = cmovznz32(x162, x143, x95);
+ uint32_t x169 = cmovznz32(x162, x140, x92);
+ uint32_t x170 = cmovznz32(x162, x137, x89);
+ uint32_t x171 = cmovznz32(x162, x134, x86);
+ uint32_t x172 = cmovznz32(x162, x131, x83);
+ uint32_t x173 = cmovznz32(x162, x128, x80);
+ uint32_t x174 = cmovznz32(x162, x125, x77);
+ uint32_t x175 = cmovznz32(x162, x122, x74);
+ uint32_t x176 = cmovznz32(x162, x119, x71);
+ uint32_t x177 = cmovznz32(x162, x116, x68);
+ uint32_t x178 = cmovznz32(x162, x113, x65);
  return (x163, x164, x165, x166, x167, x168, x169, x170, x171, x172, x173, x174, x175, x176, x177, x178))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e495m31/feadd.c b/src/Specific/montgomery32_2e495m31/feadd.c
index 61105f800..98ff25687 100644
--- a/src/Specific/montgomery32_2e495m31/feadd.c
+++ b/src/Specific/montgomery32_2e495m31/feadd.c
@@ -64,22 +64,22 @@ static void feadd(uint32_t out[16], const uint32_t in1[16], const uint32_t in2[1
   { uint32_t x155; uint8_t x156 = _subborrow_u32(x153, x107, 0xffffffff, &x155);
   { uint32_t x158; uint8_t x159 = _subborrow_u32(x156, x110, 0x7fff, &x158);
   { uint32_t _; uint8_t x162 = _subborrow_u32(x159, x111, 0x0, &_);
-  { uint32_t x163 = cmovznz(x162, x158, x110);
-  { uint32_t x164 = cmovznz(x162, x155, x107);
-  { uint32_t x165 = cmovznz(x162, x152, x104);
-  { uint32_t x166 = cmovznz(x162, x149, x101);
-  { uint32_t x167 = cmovznz(x162, x146, x98);
-  { uint32_t x168 = cmovznz(x162, x143, x95);
-  { uint32_t x169 = cmovznz(x162, x140, x92);
-  { uint32_t x170 = cmovznz(x162, x137, x89);
-  { uint32_t x171 = cmovznz(x162, x134, x86);
-  { uint32_t x172 = cmovznz(x162, x131, x83);
-  { uint32_t x173 = cmovznz(x162, x128, x80);
-  { uint32_t x174 = cmovznz(x162, x125, x77);
-  { uint32_t x175 = cmovznz(x162, x122, x74);
-  { uint32_t x176 = cmovznz(x162, x119, x71);
-  { uint32_t x177 = cmovznz(x162, x116, x68);
-  { uint32_t x178 = cmovznz(x162, x113, x65);
+  { uint32_t x163 = cmovznz32(x162, x158, x110);
+  { uint32_t x164 = cmovznz32(x162, x155, x107);
+  { uint32_t x165 = cmovznz32(x162, x152, x104);
+  { uint32_t x166 = cmovznz32(x162, x149, x101);
+  { uint32_t x167 = cmovznz32(x162, x146, x98);
+  { uint32_t x168 = cmovznz32(x162, x143, x95);
+  { uint32_t x169 = cmovznz32(x162, x140, x92);
+  { uint32_t x170 = cmovznz32(x162, x137, x89);
+  { uint32_t x171 = cmovznz32(x162, x134, x86);
+  { uint32_t x172 = cmovznz32(x162, x131, x83);
+  { uint32_t x173 = cmovznz32(x162, x128, x80);
+  { uint32_t x174 = cmovznz32(x162, x125, x77);
+  { uint32_t x175 = cmovznz32(x162, x122, x74);
+  { uint32_t x176 = cmovznz32(x162, x119, x71);
+  { uint32_t x177 = cmovznz32(x162, x116, x68);
+  { uint32_t x178 = cmovznz32(x162, x113, x65);
   out[0] = x178;
   out[1] = x177;
   out[2] = x176;
diff --git a/src/Specific/montgomery32_2e495m31/feaddDisplay.log b/src/Specific/montgomery32_2e495m31/feaddDisplay.log
index 941e8a887..7dc2014d6 100644
--- a/src/Specific/montgomery32_2e495m31/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e495m31/feaddDisplay.log
@@ -35,22 +35,22 @@ Interp-η
  uint32_t x155, uint8_t x156 = subborrow_u32(x153, x107, 0xffffffff);
  uint32_t x158, uint8_t x159 = subborrow_u32(x156, x110, 0x7fff);
  uint32_t _, uint8_t x162 = subborrow_u32(x159, x111, 0x0);
- uint32_t x163 = cmovznz(x162, x158, x110);
- uint32_t x164 = cmovznz(x162, x155, x107);
- uint32_t x165 = cmovznz(x162, x152, x104);
- uint32_t x166 = cmovznz(x162, x149, x101);
- uint32_t x167 = cmovznz(x162, x146, x98);
- uint32_t x168 = cmovznz(x162, x143, x95);
- uint32_t x169 = cmovznz(x162, x140, x92);
- uint32_t x170 = cmovznz(x162, x137, x89);
- uint32_t x171 = cmovznz(x162, x134, x86);
- uint32_t x172 = cmovznz(x162, x131, x83);
- uint32_t x173 = cmovznz(x162, x128, x80);
- uint32_t x174 = cmovznz(x162, x125, x77);
- uint32_t x175 = cmovznz(x162, x122, x74);
- uint32_t x176 = cmovznz(x162, x119, x71);
- uint32_t x177 = cmovznz(x162, x116, x68);
- uint32_t x178 = cmovznz(x162, x113, x65);
+ uint32_t x163 = cmovznz32(x162, x158, x110);
+ uint32_t x164 = cmovznz32(x162, x155, x107);
+ uint32_t x165 = cmovznz32(x162, x152, x104);
+ uint32_t x166 = cmovznz32(x162, x149, x101);
+ uint32_t x167 = cmovznz32(x162, x146, x98);
+ uint32_t x168 = cmovznz32(x162, x143, x95);
+ uint32_t x169 = cmovznz32(x162, x140, x92);
+ uint32_t x170 = cmovznz32(x162, x137, x89);
+ uint32_t x171 = cmovznz32(x162, x134, x86);
+ uint32_t x172 = cmovznz32(x162, x131, x83);
+ uint32_t x173 = cmovznz32(x162, x128, x80);
+ uint32_t x174 = cmovznz32(x162, x125, x77);
+ uint32_t x175 = cmovznz32(x162, x122, x74);
+ uint32_t x176 = cmovznz32(x162, x119, x71);
+ uint32_t x177 = cmovznz32(x162, x116, x68);
+ uint32_t x178 = cmovznz32(x162, x113, x65);
  return (x163, x164, x165, x166, x167, x168, x169, x170, x171, x172, x173, x174, x175, x176, x177, x178))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e510m290x2e496m1/feadd.c b/src/Specific/montgomery32_2e510m290x2e496m1/feadd.c
index 23f19672c..9ad623033 100644
--- a/src/Specific/montgomery32_2e510m290x2e496m1/feadd.c
+++ b/src/Specific/montgomery32_2e510m290x2e496m1/feadd.c
@@ -64,22 +64,22 @@ static void feadd(uint32_t out[16], const uint32_t in1[16], const uint32_t in2[1
   { uint32_t x155; uint8_t x156 = _subborrow_u32(x153, x107, 0xffffffff, &x155);
   { uint32_t x158; uint8_t x159 = _subborrow_u32(x156, x110, 0x3eddffff, &x158);
   { uint32_t _; uint8_t x162 = _subborrow_u32(x159, x111, 0x0, &_);
-  { uint32_t x163 = cmovznz(x162, x158, x110);
-  { uint32_t x164 = cmovznz(x162, x155, x107);
-  { uint32_t x165 = cmovznz(x162, x152, x104);
-  { uint32_t x166 = cmovznz(x162, x149, x101);
-  { uint32_t x167 = cmovznz(x162, x146, x98);
-  { uint32_t x168 = cmovznz(x162, x143, x95);
-  { uint32_t x169 = cmovznz(x162, x140, x92);
-  { uint32_t x170 = cmovznz(x162, x137, x89);
-  { uint32_t x171 = cmovznz(x162, x134, x86);
-  { uint32_t x172 = cmovznz(x162, x131, x83);
-  { uint32_t x173 = cmovznz(x162, x128, x80);
-  { uint32_t x174 = cmovznz(x162, x125, x77);
-  { uint32_t x175 = cmovznz(x162, x122, x74);
-  { uint32_t x176 = cmovznz(x162, x119, x71);
-  { uint32_t x177 = cmovznz(x162, x116, x68);
-  { uint32_t x178 = cmovznz(x162, x113, x65);
+  { uint32_t x163 = cmovznz32(x162, x158, x110);
+  { uint32_t x164 = cmovznz32(x162, x155, x107);
+  { uint32_t x165 = cmovznz32(x162, x152, x104);
+  { uint32_t x166 = cmovznz32(x162, x149, x101);
+  { uint32_t x167 = cmovznz32(x162, x146, x98);
+  { uint32_t x168 = cmovznz32(x162, x143, x95);
+  { uint32_t x169 = cmovznz32(x162, x140, x92);
+  { uint32_t x170 = cmovznz32(x162, x137, x89);
+  { uint32_t x171 = cmovznz32(x162, x134, x86);
+  { uint32_t x172 = cmovznz32(x162, x131, x83);
+  { uint32_t x173 = cmovznz32(x162, x128, x80);
+  { uint32_t x174 = cmovznz32(x162, x125, x77);
+  { uint32_t x175 = cmovznz32(x162, x122, x74);
+  { uint32_t x176 = cmovznz32(x162, x119, x71);
+  { uint32_t x177 = cmovznz32(x162, x116, x68);
+  { uint32_t x178 = cmovznz32(x162, x113, x65);
   out[0] = x178;
   out[1] = x177;
   out[2] = x176;
diff --git a/src/Specific/montgomery32_2e510m290x2e496m1/feaddDisplay.log b/src/Specific/montgomery32_2e510m290x2e496m1/feaddDisplay.log
index a2c6acb63..36c81d199 100644
--- a/src/Specific/montgomery32_2e510m290x2e496m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e510m290x2e496m1/feaddDisplay.log
@@ -35,22 +35,22 @@ Interp-η
  uint32_t x155, uint8_t x156 = subborrow_u32(x153, x107, 0xffffffff);
  uint32_t x158, uint8_t x159 = subborrow_u32(x156, x110, 0x3eddffff);
  uint32_t _, uint8_t x162 = subborrow_u32(x159, x111, 0x0);
- uint32_t x163 = cmovznz(x162, x158, x110);
- uint32_t x164 = cmovznz(x162, x155, x107);
- uint32_t x165 = cmovznz(x162, x152, x104);
- uint32_t x166 = cmovznz(x162, x149, x101);
- uint32_t x167 = cmovznz(x162, x146, x98);
- uint32_t x168 = cmovznz(x162, x143, x95);
- uint32_t x169 = cmovznz(x162, x140, x92);
- uint32_t x170 = cmovznz(x162, x137, x89);
- uint32_t x171 = cmovznz(x162, x134, x86);
- uint32_t x172 = cmovznz(x162, x131, x83);
- uint32_t x173 = cmovznz(x162, x128, x80);
- uint32_t x174 = cmovznz(x162, x125, x77);
- uint32_t x175 = cmovznz(x162, x122, x74);
- uint32_t x176 = cmovznz(x162, x119, x71);
- uint32_t x177 = cmovznz(x162, x116, x68);
- uint32_t x178 = cmovznz(x162, x113, x65);
+ uint32_t x163 = cmovznz32(x162, x158, x110);
+ uint32_t x164 = cmovznz32(x162, x155, x107);
+ uint32_t x165 = cmovznz32(x162, x152, x104);
+ uint32_t x166 = cmovznz32(x162, x149, x101);
+ uint32_t x167 = cmovznz32(x162, x146, x98);
+ uint32_t x168 = cmovznz32(x162, x143, x95);
+ uint32_t x169 = cmovznz32(x162, x140, x92);
+ uint32_t x170 = cmovznz32(x162, x137, x89);
+ uint32_t x171 = cmovznz32(x162, x134, x86);
+ uint32_t x172 = cmovznz32(x162, x131, x83);
+ uint32_t x173 = cmovznz32(x162, x128, x80);
+ uint32_t x174 = cmovznz32(x162, x125, x77);
+ uint32_t x175 = cmovznz32(x162, x122, x74);
+ uint32_t x176 = cmovznz32(x162, x119, x71);
+ uint32_t x177 = cmovznz32(x162, x116, x68);
+ uint32_t x178 = cmovznz32(x162, x113, x65);
  return (x163, x164, x165, x166, x167, x168, x169, x170, x171, x172, x173, x174, x175, x176, x177, x178))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e511m187/feadd.c b/src/Specific/montgomery32_2e511m187/feadd.c
index c564ec668..ccbd5e348 100644
--- a/src/Specific/montgomery32_2e511m187/feadd.c
+++ b/src/Specific/montgomery32_2e511m187/feadd.c
@@ -64,22 +64,22 @@ static void feadd(uint32_t out[16], const uint32_t in1[16], const uint32_t in2[1
   { uint32_t x155; uint8_t x156 = _subborrow_u32(x153, x107, 0xffffffff, &x155);
   { uint32_t x158; uint8_t x159 = _subborrow_u32(x156, x110, 0x7fffffff, &x158);
   { uint32_t _; uint8_t x162 = _subborrow_u32(x159, x111, 0x0, &_);
-  { uint32_t x163 = cmovznz(x162, x158, x110);
-  { uint32_t x164 = cmovznz(x162, x155, x107);
-  { uint32_t x165 = cmovznz(x162, x152, x104);
-  { uint32_t x166 = cmovznz(x162, x149, x101);
-  { uint32_t x167 = cmovznz(x162, x146, x98);
-  { uint32_t x168 = cmovznz(x162, x143, x95);
-  { uint32_t x169 = cmovznz(x162, x140, x92);
-  { uint32_t x170 = cmovznz(x162, x137, x89);
-  { uint32_t x171 = cmovznz(x162, x134, x86);
-  { uint32_t x172 = cmovznz(x162, x131, x83);
-  { uint32_t x173 = cmovznz(x162, x128, x80);
-  { uint32_t x174 = cmovznz(x162, x125, x77);
-  { uint32_t x175 = cmovznz(x162, x122, x74);
-  { uint32_t x176 = cmovznz(x162, x119, x71);
-  { uint32_t x177 = cmovznz(x162, x116, x68);
-  { uint32_t x178 = cmovznz(x162, x113, x65);
+  { uint32_t x163 = cmovznz32(x162, x158, x110);
+  { uint32_t x164 = cmovznz32(x162, x155, x107);
+  { uint32_t x165 = cmovznz32(x162, x152, x104);
+  { uint32_t x166 = cmovznz32(x162, x149, x101);
+  { uint32_t x167 = cmovznz32(x162, x146, x98);
+  { uint32_t x168 = cmovznz32(x162, x143, x95);
+  { uint32_t x169 = cmovznz32(x162, x140, x92);
+  { uint32_t x170 = cmovznz32(x162, x137, x89);
+  { uint32_t x171 = cmovznz32(x162, x134, x86);
+  { uint32_t x172 = cmovznz32(x162, x131, x83);
+  { uint32_t x173 = cmovznz32(x162, x128, x80);
+  { uint32_t x174 = cmovznz32(x162, x125, x77);
+  { uint32_t x175 = cmovznz32(x162, x122, x74);
+  { uint32_t x176 = cmovznz32(x162, x119, x71);
+  { uint32_t x177 = cmovznz32(x162, x116, x68);
+  { uint32_t x178 = cmovznz32(x162, x113, x65);
   out[0] = x178;
   out[1] = x177;
   out[2] = x176;
diff --git a/src/Specific/montgomery32_2e511m187/feaddDisplay.log b/src/Specific/montgomery32_2e511m187/feaddDisplay.log
index fa3819276..59330b3bf 100644
--- a/src/Specific/montgomery32_2e511m187/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e511m187/feaddDisplay.log
@@ -35,22 +35,22 @@ Interp-η
  uint32_t x155, uint8_t x156 = subborrow_u32(x153, x107, 0xffffffff);
  uint32_t x158, uint8_t x159 = subborrow_u32(x156, x110, 0x7fffffff);
  uint32_t _, uint8_t x162 = subborrow_u32(x159, x111, 0x0);
- uint32_t x163 = cmovznz(x162, x158, x110);
- uint32_t x164 = cmovznz(x162, x155, x107);
- uint32_t x165 = cmovznz(x162, x152, x104);
- uint32_t x166 = cmovznz(x162, x149, x101);
- uint32_t x167 = cmovznz(x162, x146, x98);
- uint32_t x168 = cmovznz(x162, x143, x95);
- uint32_t x169 = cmovznz(x162, x140, x92);
- uint32_t x170 = cmovznz(x162, x137, x89);
- uint32_t x171 = cmovznz(x162, x134, x86);
- uint32_t x172 = cmovznz(x162, x131, x83);
- uint32_t x173 = cmovznz(x162, x128, x80);
- uint32_t x174 = cmovznz(x162, x125, x77);
- uint32_t x175 = cmovznz(x162, x122, x74);
- uint32_t x176 = cmovznz(x162, x119, x71);
- uint32_t x177 = cmovznz(x162, x116, x68);
- uint32_t x178 = cmovznz(x162, x113, x65);
+ uint32_t x163 = cmovznz32(x162, x158, x110);
+ uint32_t x164 = cmovznz32(x162, x155, x107);
+ uint32_t x165 = cmovznz32(x162, x152, x104);
+ uint32_t x166 = cmovznz32(x162, x149, x101);
+ uint32_t x167 = cmovznz32(x162, x146, x98);
+ uint32_t x168 = cmovznz32(x162, x143, x95);
+ uint32_t x169 = cmovznz32(x162, x140, x92);
+ uint32_t x170 = cmovznz32(x162, x137, x89);
+ uint32_t x171 = cmovznz32(x162, x134, x86);
+ uint32_t x172 = cmovznz32(x162, x131, x83);
+ uint32_t x173 = cmovznz32(x162, x128, x80);
+ uint32_t x174 = cmovznz32(x162, x125, x77);
+ uint32_t x175 = cmovznz32(x162, x122, x74);
+ uint32_t x176 = cmovznz32(x162, x119, x71);
+ uint32_t x177 = cmovznz32(x162, x116, x68);
+ uint32_t x178 = cmovznz32(x162, x113, x65);
  return (x163, x164, x165, x166, x167, x168, x169, x170, x171, x172, x173, x174, x175, x176, x177, x178))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e511m481/feadd.c b/src/Specific/montgomery32_2e511m481/feadd.c
index a15361b34..17497e041 100644
--- a/src/Specific/montgomery32_2e511m481/feadd.c
+++ b/src/Specific/montgomery32_2e511m481/feadd.c
@@ -64,22 +64,22 @@ static void feadd(uint32_t out[16], const uint32_t in1[16], const uint32_t in2[1
   { uint32_t x155; uint8_t x156 = _subborrow_u32(x153, x107, 0xffffffff, &x155);
   { uint32_t x158; uint8_t x159 = _subborrow_u32(x156, x110, 0x7fffffff, &x158);
   { uint32_t _; uint8_t x162 = _subborrow_u32(x159, x111, 0x0, &_);
-  { uint32_t x163 = cmovznz(x162, x158, x110);
-  { uint32_t x164 = cmovznz(x162, x155, x107);
-  { uint32_t x165 = cmovznz(x162, x152, x104);
-  { uint32_t x166 = cmovznz(x162, x149, x101);
-  { uint32_t x167 = cmovznz(x162, x146, x98);
-  { uint32_t x168 = cmovznz(x162, x143, x95);
-  { uint32_t x169 = cmovznz(x162, x140, x92);
-  { uint32_t x170 = cmovznz(x162, x137, x89);
-  { uint32_t x171 = cmovznz(x162, x134, x86);
-  { uint32_t x172 = cmovznz(x162, x131, x83);
-  { uint32_t x173 = cmovznz(x162, x128, x80);
-  { uint32_t x174 = cmovznz(x162, x125, x77);
-  { uint32_t x175 = cmovznz(x162, x122, x74);
-  { uint32_t x176 = cmovznz(x162, x119, x71);
-  { uint32_t x177 = cmovznz(x162, x116, x68);
-  { uint32_t x178 = cmovznz(x162, x113, x65);
+  { uint32_t x163 = cmovznz32(x162, x158, x110);
+  { uint32_t x164 = cmovznz32(x162, x155, x107);
+  { uint32_t x165 = cmovznz32(x162, x152, x104);
+  { uint32_t x166 = cmovznz32(x162, x149, x101);
+  { uint32_t x167 = cmovznz32(x162, x146, x98);
+  { uint32_t x168 = cmovznz32(x162, x143, x95);
+  { uint32_t x169 = cmovznz32(x162, x140, x92);
+  { uint32_t x170 = cmovznz32(x162, x137, x89);
+  { uint32_t x171 = cmovznz32(x162, x134, x86);
+  { uint32_t x172 = cmovznz32(x162, x131, x83);
+  { uint32_t x173 = cmovznz32(x162, x128, x80);
+  { uint32_t x174 = cmovznz32(x162, x125, x77);
+  { uint32_t x175 = cmovznz32(x162, x122, x74);
+  { uint32_t x176 = cmovznz32(x162, x119, x71);
+  { uint32_t x177 = cmovznz32(x162, x116, x68);
+  { uint32_t x178 = cmovznz32(x162, x113, x65);
   out[0] = x178;
   out[1] = x177;
   out[2] = x176;
diff --git a/src/Specific/montgomery32_2e511m481/feaddDisplay.log b/src/Specific/montgomery32_2e511m481/feaddDisplay.log
index 5e2a7b1b6..08f7c6c17 100644
--- a/src/Specific/montgomery32_2e511m481/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e511m481/feaddDisplay.log
@@ -35,22 +35,22 @@ Interp-η
  uint32_t x155, uint8_t x156 = subborrow_u32(x153, x107, 0xffffffff);
  uint32_t x158, uint8_t x159 = subborrow_u32(x156, x110, 0x7fffffff);
  uint32_t _, uint8_t x162 = subborrow_u32(x159, x111, 0x0);
- uint32_t x163 = cmovznz(x162, x158, x110);
- uint32_t x164 = cmovznz(x162, x155, x107);
- uint32_t x165 = cmovznz(x162, x152, x104);
- uint32_t x166 = cmovznz(x162, x149, x101);
- uint32_t x167 = cmovznz(x162, x146, x98);
- uint32_t x168 = cmovznz(x162, x143, x95);
- uint32_t x169 = cmovznz(x162, x140, x92);
- uint32_t x170 = cmovznz(x162, x137, x89);
- uint32_t x171 = cmovznz(x162, x134, x86);
- uint32_t x172 = cmovznz(x162, x131, x83);
- uint32_t x173 = cmovznz(x162, x128, x80);
- uint32_t x174 = cmovznz(x162, x125, x77);
- uint32_t x175 = cmovznz(x162, x122, x74);
- uint32_t x176 = cmovznz(x162, x119, x71);
- uint32_t x177 = cmovznz(x162, x116, x68);
- uint32_t x178 = cmovznz(x162, x113, x65);
+ uint32_t x163 = cmovznz32(x162, x158, x110);
+ uint32_t x164 = cmovznz32(x162, x155, x107);
+ uint32_t x165 = cmovznz32(x162, x152, x104);
+ uint32_t x166 = cmovznz32(x162, x149, x101);
+ uint32_t x167 = cmovznz32(x162, x146, x98);
+ uint32_t x168 = cmovznz32(x162, x143, x95);
+ uint32_t x169 = cmovznz32(x162, x140, x92);
+ uint32_t x170 = cmovznz32(x162, x137, x89);
+ uint32_t x171 = cmovznz32(x162, x134, x86);
+ uint32_t x172 = cmovznz32(x162, x131, x83);
+ uint32_t x173 = cmovznz32(x162, x128, x80);
+ uint32_t x174 = cmovznz32(x162, x125, x77);
+ uint32_t x175 = cmovznz32(x162, x122, x74);
+ uint32_t x176 = cmovznz32(x162, x119, x71);
+ uint32_t x177 = cmovznz32(x162, x116, x68);
+ uint32_t x178 = cmovznz32(x162, x113, x65);
  return (x163, x164, x165, x166, x167, x168, x169, x170, x171, x172, x173, x174, x175, x176, x177, x178))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e512m491x2e496m1/feadd.c b/src/Specific/montgomery32_2e512m491x2e496m1/feadd.c
index bf23193ff..b107d1c5e 100644
--- a/src/Specific/montgomery32_2e512m491x2e496m1/feadd.c
+++ b/src/Specific/montgomery32_2e512m491x2e496m1/feadd.c
@@ -64,22 +64,22 @@ static void feadd(uint32_t out[16], const uint32_t in1[16], const uint32_t in2[1
   { uint32_t x155; uint8_t x156 = _subborrow_u32(x153, x107, 0xffffffff, &x155);
   { uint32_t x158; uint8_t x159 = _subborrow_u32(x156, x110, 0xfe14ffff, &x158);
   { uint32_t _; uint8_t x162 = _subborrow_u32(x159, x111, 0x0, &_);
-  { uint32_t x163 = cmovznz(x162, x158, x110);
-  { uint32_t x164 = cmovznz(x162, x155, x107);
-  { uint32_t x165 = cmovznz(x162, x152, x104);
-  { uint32_t x166 = cmovznz(x162, x149, x101);
-  { uint32_t x167 = cmovznz(x162, x146, x98);
-  { uint32_t x168 = cmovznz(x162, x143, x95);
-  { uint32_t x169 = cmovznz(x162, x140, x92);
-  { uint32_t x170 = cmovznz(x162, x137, x89);
-  { uint32_t x171 = cmovznz(x162, x134, x86);
-  { uint32_t x172 = cmovznz(x162, x131, x83);
-  { uint32_t x173 = cmovznz(x162, x128, x80);
-  { uint32_t x174 = cmovznz(x162, x125, x77);
-  { uint32_t x175 = cmovznz(x162, x122, x74);
-  { uint32_t x176 = cmovznz(x162, x119, x71);
-  { uint32_t x177 = cmovznz(x162, x116, x68);
-  { uint32_t x178 = cmovznz(x162, x113, x65);
+  { uint32_t x163 = cmovznz32(x162, x158, x110);
+  { uint32_t x164 = cmovznz32(x162, x155, x107);
+  { uint32_t x165 = cmovznz32(x162, x152, x104);
+  { uint32_t x166 = cmovznz32(x162, x149, x101);
+  { uint32_t x167 = cmovznz32(x162, x146, x98);
+  { uint32_t x168 = cmovznz32(x162, x143, x95);
+  { uint32_t x169 = cmovznz32(x162, x140, x92);
+  { uint32_t x170 = cmovznz32(x162, x137, x89);
+  { uint32_t x171 = cmovznz32(x162, x134, x86);
+  { uint32_t x172 = cmovznz32(x162, x131, x83);
+  { uint32_t x173 = cmovznz32(x162, x128, x80);
+  { uint32_t x174 = cmovznz32(x162, x125, x77);
+  { uint32_t x175 = cmovznz32(x162, x122, x74);
+  { uint32_t x176 = cmovznz32(x162, x119, x71);
+  { uint32_t x177 = cmovznz32(x162, x116, x68);
+  { uint32_t x178 = cmovznz32(x162, x113, x65);
   out[0] = x178;
   out[1] = x177;
   out[2] = x176;
diff --git a/src/Specific/montgomery32_2e512m491x2e496m1/feaddDisplay.log b/src/Specific/montgomery32_2e512m491x2e496m1/feaddDisplay.log
index 9b0e914e5..e0fa0330d 100644
--- a/src/Specific/montgomery32_2e512m491x2e496m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e512m491x2e496m1/feaddDisplay.log
@@ -35,22 +35,22 @@ Interp-η
  uint32_t x155, uint8_t x156 = subborrow_u32(x153, x107, 0xffffffff);
  uint32_t x158, uint8_t x159 = subborrow_u32(x156, x110, 0xfe14ffff);
  uint32_t _, uint8_t x162 = subborrow_u32(x159, x111, 0x0);
- uint32_t x163 = cmovznz(x162, x158, x110);
- uint32_t x164 = cmovznz(x162, x155, x107);
- uint32_t x165 = cmovznz(x162, x152, x104);
- uint32_t x166 = cmovznz(x162, x149, x101);
- uint32_t x167 = cmovznz(x162, x146, x98);
- uint32_t x168 = cmovznz(x162, x143, x95);
- uint32_t x169 = cmovznz(x162, x140, x92);
- uint32_t x170 = cmovznz(x162, x137, x89);
- uint32_t x171 = cmovznz(x162, x134, x86);
- uint32_t x172 = cmovznz(x162, x131, x83);
- uint32_t x173 = cmovznz(x162, x128, x80);
- uint32_t x174 = cmovznz(x162, x125, x77);
- uint32_t x175 = cmovznz(x162, x122, x74);
- uint32_t x176 = cmovznz(x162, x119, x71);
- uint32_t x177 = cmovznz(x162, x116, x68);
- uint32_t x178 = cmovznz(x162, x113, x65);
+ uint32_t x163 = cmovznz32(x162, x158, x110);
+ uint32_t x164 = cmovznz32(x162, x155, x107);
+ uint32_t x165 = cmovznz32(x162, x152, x104);
+ uint32_t x166 = cmovznz32(x162, x149, x101);
+ uint32_t x167 = cmovznz32(x162, x146, x98);
+ uint32_t x168 = cmovznz32(x162, x143, x95);
+ uint32_t x169 = cmovznz32(x162, x140, x92);
+ uint32_t x170 = cmovznz32(x162, x137, x89);
+ uint32_t x171 = cmovznz32(x162, x134, x86);
+ uint32_t x172 = cmovznz32(x162, x131, x83);
+ uint32_t x173 = cmovznz32(x162, x128, x80);
+ uint32_t x174 = cmovznz32(x162, x125, x77);
+ uint32_t x175 = cmovznz32(x162, x122, x74);
+ uint32_t x176 = cmovznz32(x162, x119, x71);
+ uint32_t x177 = cmovznz32(x162, x116, x68);
+ uint32_t x178 = cmovznz32(x162, x113, x65);
  return (x163, x164, x165, x166, x167, x168, x169, x170, x171, x172, x173, x174, x175, x176, x177, x178))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e512m569/feadd.c b/src/Specific/montgomery32_2e512m569/feadd.c
index 2fa2de575..60bca6599 100644
--- a/src/Specific/montgomery32_2e512m569/feadd.c
+++ b/src/Specific/montgomery32_2e512m569/feadd.c
@@ -64,22 +64,22 @@ static void feadd(uint32_t out[16], const uint32_t in1[16], const uint32_t in2[1
   { uint32_t x155; uint8_t x156 = _subborrow_u32(x153, x107, 0xffffffff, &x155);
   { uint32_t x158; uint8_t x159 = _subborrow_u32(x156, x110, 0xffffffff, &x158);
   { uint32_t _; uint8_t x162 = _subborrow_u32(x159, x111, 0x0, &_);
-  { uint32_t x163 = cmovznz(x162, x158, x110);
-  { uint32_t x164 = cmovznz(x162, x155, x107);
-  { uint32_t x165 = cmovznz(x162, x152, x104);
-  { uint32_t x166 = cmovznz(x162, x149, x101);
-  { uint32_t x167 = cmovznz(x162, x146, x98);
-  { uint32_t x168 = cmovznz(x162, x143, x95);
-  { uint32_t x169 = cmovznz(x162, x140, x92);
-  { uint32_t x170 = cmovznz(x162, x137, x89);
-  { uint32_t x171 = cmovznz(x162, x134, x86);
-  { uint32_t x172 = cmovznz(x162, x131, x83);
-  { uint32_t x173 = cmovznz(x162, x128, x80);
-  { uint32_t x174 = cmovznz(x162, x125, x77);
-  { uint32_t x175 = cmovznz(x162, x122, x74);
-  { uint32_t x176 = cmovznz(x162, x119, x71);
-  { uint32_t x177 = cmovznz(x162, x116, x68);
-  { uint32_t x178 = cmovznz(x162, x113, x65);
+  { uint32_t x163 = cmovznz32(x162, x158, x110);
+  { uint32_t x164 = cmovznz32(x162, x155, x107);
+  { uint32_t x165 = cmovznz32(x162, x152, x104);
+  { uint32_t x166 = cmovznz32(x162, x149, x101);
+  { uint32_t x167 = cmovznz32(x162, x146, x98);
+  { uint32_t x168 = cmovznz32(x162, x143, x95);
+  { uint32_t x169 = cmovznz32(x162, x140, x92);
+  { uint32_t x170 = cmovznz32(x162, x137, x89);
+  { uint32_t x171 = cmovznz32(x162, x134, x86);
+  { uint32_t x172 = cmovznz32(x162, x131, x83);
+  { uint32_t x173 = cmovznz32(x162, x128, x80);
+  { uint32_t x174 = cmovznz32(x162, x125, x77);
+  { uint32_t x175 = cmovznz32(x162, x122, x74);
+  { uint32_t x176 = cmovznz32(x162, x119, x71);
+  { uint32_t x177 = cmovznz32(x162, x116, x68);
+  { uint32_t x178 = cmovznz32(x162, x113, x65);
   out[0] = x178;
   out[1] = x177;
   out[2] = x176;
diff --git a/src/Specific/montgomery32_2e512m569/feaddDisplay.log b/src/Specific/montgomery32_2e512m569/feaddDisplay.log
index df85b18ee..7b83b4a4f 100644
--- a/src/Specific/montgomery32_2e512m569/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e512m569/feaddDisplay.log
@@ -35,22 +35,22 @@ Interp-η
  uint32_t x155, uint8_t x156 = subborrow_u32(x153, x107, 0xffffffff);
  uint32_t x158, uint8_t x159 = subborrow_u32(x156, x110, 0xffffffff);
  uint32_t _, uint8_t x162 = subborrow_u32(x159, x111, 0x0);
- uint32_t x163 = cmovznz(x162, x158, x110);
- uint32_t x164 = cmovznz(x162, x155, x107);
- uint32_t x165 = cmovznz(x162, x152, x104);
- uint32_t x166 = cmovznz(x162, x149, x101);
- uint32_t x167 = cmovznz(x162, x146, x98);
- uint32_t x168 = cmovznz(x162, x143, x95);
- uint32_t x169 = cmovznz(x162, x140, x92);
- uint32_t x170 = cmovznz(x162, x137, x89);
- uint32_t x171 = cmovznz(x162, x134, x86);
- uint32_t x172 = cmovznz(x162, x131, x83);
- uint32_t x173 = cmovznz(x162, x128, x80);
- uint32_t x174 = cmovznz(x162, x125, x77);
- uint32_t x175 = cmovznz(x162, x122, x74);
- uint32_t x176 = cmovznz(x162, x119, x71);
- uint32_t x177 = cmovznz(x162, x116, x68);
- uint32_t x178 = cmovznz(x162, x113, x65);
+ uint32_t x163 = cmovznz32(x162, x158, x110);
+ uint32_t x164 = cmovznz32(x162, x155, x107);
+ uint32_t x165 = cmovznz32(x162, x152, x104);
+ uint32_t x166 = cmovznz32(x162, x149, x101);
+ uint32_t x167 = cmovznz32(x162, x146, x98);
+ uint32_t x168 = cmovznz32(x162, x143, x95);
+ uint32_t x169 = cmovznz32(x162, x140, x92);
+ uint32_t x170 = cmovznz32(x162, x137, x89);
+ uint32_t x171 = cmovznz32(x162, x134, x86);
+ uint32_t x172 = cmovznz32(x162, x131, x83);
+ uint32_t x173 = cmovznz32(x162, x128, x80);
+ uint32_t x174 = cmovznz32(x162, x125, x77);
+ uint32_t x175 = cmovznz32(x162, x122, x74);
+ uint32_t x176 = cmovznz32(x162, x119, x71);
+ uint32_t x177 = cmovznz32(x162, x116, x68);
+ uint32_t x178 = cmovznz32(x162, x113, x65);
  return (x163, x164, x165, x166, x167, x168, x169, x170, x171, x172, x173, x174, x175, x176, x177, x178))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e521m1/feadd.c b/src/Specific/montgomery32_2e521m1/feadd.c
index edfa8f2a1..7019270b1 100644
--- a/src/Specific/montgomery32_2e521m1/feadd.c
+++ b/src/Specific/montgomery32_2e521m1/feadd.c
@@ -68,23 +68,23 @@ static void feadd(uint32_t out[17], const uint32_t in1[17], const uint32_t in2[1
   { uint32_t x165; uint8_t x166 = _subborrow_u32(x163, x114, 0xffffffff, &x165);
   { uint32_t x168; uint8_t x169 = _subborrow_u32(x166, x117, 0x1ff, &x168);
   { uint32_t _; uint8_t x172 = _subborrow_u32(x169, x118, 0x0, &_);
-  { uint32_t x173 = cmovznz(x172, x168, x117);
-  { uint32_t x174 = cmovznz(x172, x165, x114);
-  { uint32_t x175 = cmovznz(x172, x162, x111);
-  { uint32_t x176 = cmovznz(x172, x159, x108);
-  { uint32_t x177 = cmovznz(x172, x156, x105);
-  { uint32_t x178 = cmovznz(x172, x153, x102);
-  { uint32_t x179 = cmovznz(x172, x150, x99);
-  { uint32_t x180 = cmovznz(x172, x147, x96);
-  { uint32_t x181 = cmovznz(x172, x144, x93);
-  { uint32_t x182 = cmovznz(x172, x141, x90);
-  { uint32_t x183 = cmovznz(x172, x138, x87);
-  { uint32_t x184 = cmovznz(x172, x135, x84);
-  { uint32_t x185 = cmovznz(x172, x132, x81);
-  { uint32_t x186 = cmovznz(x172, x129, x78);
-  { uint32_t x187 = cmovznz(x172, x126, x75);
-  { uint32_t x188 = cmovznz(x172, x123, x72);
-  { uint32_t x189 = cmovznz(x172, x120, x69);
+  { uint32_t x173 = cmovznz32(x172, x168, x117);
+  { uint32_t x174 = cmovznz32(x172, x165, x114);
+  { uint32_t x175 = cmovznz32(x172, x162, x111);
+  { uint32_t x176 = cmovznz32(x172, x159, x108);
+  { uint32_t x177 = cmovznz32(x172, x156, x105);
+  { uint32_t x178 = cmovznz32(x172, x153, x102);
+  { uint32_t x179 = cmovznz32(x172, x150, x99);
+  { uint32_t x180 = cmovznz32(x172, x147, x96);
+  { uint32_t x181 = cmovznz32(x172, x144, x93);
+  { uint32_t x182 = cmovznz32(x172, x141, x90);
+  { uint32_t x183 = cmovznz32(x172, x138, x87);
+  { uint32_t x184 = cmovznz32(x172, x135, x84);
+  { uint32_t x185 = cmovznz32(x172, x132, x81);
+  { uint32_t x186 = cmovznz32(x172, x129, x78);
+  { uint32_t x187 = cmovznz32(x172, x126, x75);
+  { uint32_t x188 = cmovznz32(x172, x123, x72);
+  { uint32_t x189 = cmovznz32(x172, x120, x69);
   out[0] = x189;
   out[1] = x188;
   out[2] = x187;
diff --git a/src/Specific/montgomery32_2e521m1/feaddDisplay.log b/src/Specific/montgomery32_2e521m1/feaddDisplay.log
index 2ec004cf2..0dbd5526d 100644
--- a/src/Specific/montgomery32_2e521m1/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e521m1/feaddDisplay.log
@@ -37,23 +37,23 @@ Interp-η
  uint32_t x165, uint8_t x166 = subborrow_u32(x163, x114, 0xffffffff);
  uint32_t x168, uint8_t x169 = subborrow_u32(x166, x117, 0x1ff);
  uint32_t _, uint8_t x172 = subborrow_u32(x169, x118, 0x0);
- uint32_t x173 = cmovznz(x172, x168, x117);
- uint32_t x174 = cmovznz(x172, x165, x114);
- uint32_t x175 = cmovznz(x172, x162, x111);
- uint32_t x176 = cmovznz(x172, x159, x108);
- uint32_t x177 = cmovznz(x172, x156, x105);
- uint32_t x178 = cmovznz(x172, x153, x102);
- uint32_t x179 = cmovznz(x172, x150, x99);
- uint32_t x180 = cmovznz(x172, x147, x96);
- uint32_t x181 = cmovznz(x172, x144, x93);
- uint32_t x182 = cmovznz(x172, x141, x90);
- uint32_t x183 = cmovznz(x172, x138, x87);
- uint32_t x184 = cmovznz(x172, x135, x84);
- uint32_t x185 = cmovznz(x172, x132, x81);
- uint32_t x186 = cmovznz(x172, x129, x78);
- uint32_t x187 = cmovznz(x172, x126, x75);
- uint32_t x188 = cmovznz(x172, x123, x72);
- uint32_t x189 = cmovznz(x172, x120, x69);
+ uint32_t x173 = cmovznz32(x172, x168, x117);
+ uint32_t x174 = cmovznz32(x172, x165, x114);
+ uint32_t x175 = cmovznz32(x172, x162, x111);
+ uint32_t x176 = cmovznz32(x172, x159, x108);
+ uint32_t x177 = cmovznz32(x172, x156, x105);
+ uint32_t x178 = cmovznz32(x172, x153, x102);
+ uint32_t x179 = cmovznz32(x172, x150, x99);
+ uint32_t x180 = cmovznz32(x172, x147, x96);
+ uint32_t x181 = cmovznz32(x172, x144, x93);
+ uint32_t x182 = cmovznz32(x172, x141, x90);
+ uint32_t x183 = cmovznz32(x172, x138, x87);
+ uint32_t x184 = cmovznz32(x172, x135, x84);
+ uint32_t x185 = cmovznz32(x172, x132, x81);
+ uint32_t x186 = cmovznz32(x172, x129, x78);
+ uint32_t x187 = cmovznz32(x172, x126, x75);
+ uint32_t x188 = cmovznz32(x172, x123, x72);
+ uint32_t x189 = cmovznz32(x172, x120, x69);
  return (x173, x174, x175, x176, x177, x178, x179, x180, x181, x182, x183, x184, x185, x186, x187, x188, x189))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery64_2e127m1/feadd.c b/src/Specific/montgomery64_2e127m1/feadd.c
index 10648472f..91fa60600 100644
--- a/src/Specific/montgomery64_2e127m1/feadd.c
+++ b/src/Specific/montgomery64_2e127m1/feadd.c
@@ -8,8 +8,8 @@ static void feadd(uint64_t out[2], const uint64_t in1[2], const uint64_t in2[2])
   { uint64_t x15; uint8_t x16 = _subborrow_u64(0x0, x9, 0xffffffffffffffffL, &x15);
   { uint64_t x18; uint8_t x19 = _subborrow_u64(x16, x12, 0x7fffffffffffffffL, &x18);
   { uint64_t _; uint8_t x22 = _subborrow_u64(x19, x13, 0x0, &_);
-  { uint64_t x23 = cmovznz(x22, x18, x12);
-  { uint64_t x24 = cmovznz(x22, x15, x9);
+  { uint64_t x23 = cmovznz64(x22, x18, x12);
+  { uint64_t x24 = cmovznz64(x22, x15, x9);
   out[0] = x24;
   out[1] = x23;
   }}}}}}}}}}}
diff --git a/src/Specific/montgomery64_2e127m1/feaddDisplay.log b/src/Specific/montgomery64_2e127m1/feaddDisplay.log
index be4b119fb..a47056f6b 100644
--- a/src/Specific/montgomery64_2e127m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e127m1/feaddDisplay.log
@@ -7,8 +7,8 @@ Interp-η
  uint64_t x15, uint8_t x16 = subborrow_u64(0x0, x9, 0xffffffffffffffffL);
  uint64_t x18, uint8_t x19 = subborrow_u64(x16, x12, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x22 = subborrow_u64(x19, x13, 0x0);
- uint64_t x23 = cmovznz(x22, x18, x12);
- uint64_t x24 = cmovznz(x22, x15, x9);
+ uint64_t x23 = cmovznz64(x22, x18, x12);
+ uint64_t x24 = cmovznz64(x22, x15, x9);
  return (x23, x24))
 (x, x0)%core
      : word64 * word64 → word64 * word64 → ReturnType (uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e127m1/femul.c b/src/Specific/montgomery64_2e127m1/femul.c
index 121f8837c..c6f5ef6fb 100644
--- a/src/Specific/montgomery64_2e127m1/femul.c
+++ b/src/Specific/montgomery64_2e127m1/femul.c
@@ -32,8 +32,8 @@ static void femul(uint64_t out[2], const uint64_t in1[2], const uint64_t in2[2])
   { uint64_t x85; uint8_t x86 = _subborrow_u64(0x0, x78, 0xffffffffffffffffL, &x85);
   { uint64_t x88; uint8_t x89 = _subborrow_u64(x86, x81, 0x7fffffffffffffffL, &x88);
   { uint64_t _; uint8_t x92 = _subborrow_u64(x89, x83, 0x0, &_);
-  { uint64_t x93 = cmovznz(x92, x88, x81);
-  { uint64_t x94 = cmovznz(x92, x85, x78);
+  { uint64_t x93 = cmovznz64(x92, x88, x81);
+  { uint64_t x94 = cmovznz64(x92, x85, x78);
   out[0] = x94;
   out[1] = x93;
   }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
diff --git a/src/Specific/montgomery64_2e127m1/femulDisplay.log b/src/Specific/montgomery64_2e127m1/femulDisplay.log
index 14db98566..ea19e6486 100644
--- a/src/Specific/montgomery64_2e127m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e127m1/femulDisplay.log
@@ -31,8 +31,8 @@ Interp-η
  uint64_t x85, uint8_t x86 = subborrow_u64(0x0, x78, 0xffffffffffffffffL);
  uint64_t x88, uint8_t x89 = subborrow_u64(x86, x81, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x92 = subborrow_u64(x89, x83, 0x0);
- uint64_t x93 = cmovznz(x92, x88, x81);
- uint64_t x94 = cmovznz(x92, x85, x78);
+ uint64_t x93 = cmovznz64(x92, x88, x81);
+ uint64_t x94 = cmovznz64(x92, x85, x78);
  return (x93, x94))
 (x, x0)%core
      : word64 * word64 → word64 * word64 → ReturnType (uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e127m1/feopp.c b/src/Specific/montgomery64_2e127m1/feopp.c
index 954c3c768..2982fec31 100644
--- a/src/Specific/montgomery64_2e127m1/feopp.c
+++ b/src/Specific/montgomery64_2e127m1/feopp.c
@@ -3,7 +3,7 @@ static void feopp(uint64_t out[2], const uint64_t in1[2]) {
   { const uint64_t x2 = in1[0];
   { uint64_t x4; uint8_t x5 = _subborrow_u64(0x0, 0x0, x2, &x4);
   { uint64_t x7; uint8_t x8 = _subborrow_u64(x5, 0x0, x1, &x7);
-  { uint64_t x9 = (uint64_t)cmovznz(x8, 0x0, 0xffffffffffffffffL);
+  { uint64_t x9 = cmovznz64(x8, 0x0, 0xffffffffffffffffL);
   { uint64_t x10 = (x9 & 0xffffffffffffffffL);
   { uint64_t x12; uint8_t x13 = _addcarryx_u64(0x0, x4, x10, &x12);
   { uint64_t x14 = (x9 & 0x7fffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e127m1/feoppDisplay.log b/src/Specific/montgomery64_2e127m1/feoppDisplay.log
index 3bc65c10b..2e861c851 100644
--- a/src/Specific/montgomery64_2e127m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e127m1/feoppDisplay.log
@@ -4,7 +4,7 @@ Interp-η
  λ '(x1, x2)%core,
  uint64_t x4, uint8_t x5 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x7, uint8_t x8 = subborrow_u64(x5, 0x0, x1);
- uint64_t x9 = (uint64_t)cmovznz(x8, 0x0, 0xffffffffffffffffL);
+ uint64_t x9 = cmovznz64(x8, 0x0, 0xffffffffffffffffL);
  uint64_t x10 = (x9 & 0xffffffffffffffffL);
  uint64_t x12, uint8_t x13 = addcarryx_u64(0x0, x4, x10);
  uint64_t x14 = (x9 & 0x7fffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e127m1/fesub.c b/src/Specific/montgomery64_2e127m1/fesub.c
index e3dedbcb8..45bb624d9 100644
--- a/src/Specific/montgomery64_2e127m1/fesub.c
+++ b/src/Specific/montgomery64_2e127m1/fesub.c
@@ -5,7 +5,7 @@ static void fesub(uint64_t out[2], const uint64_t in1[2], const uint64_t in2[2])
   { const uint64_t x7 = in2[0];
   { uint64_t x9; uint8_t x10 = _subborrow_u64(0x0, x5, x7, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, x4, x6, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xffffffffffffffffL);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x9, x15, &x17);
   { uint64_t x19 = (x14 & 0x7fffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e127m1/fesubDisplay.log b/src/Specific/montgomery64_2e127m1/fesubDisplay.log
index cae7e3506..ec41671f0 100644
--- a/src/Specific/montgomery64_2e127m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e127m1/fesubDisplay.log
@@ -4,7 +4,7 @@ Interp-η
  λ '(x4, x5, (x6, x7))%core,
  uint64_t x9, uint8_t x10 = subborrow_u64(0x0, x5, x7);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, x4, x6);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xffffffffffffffffL);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x9, x15);
  uint64_t x19 = (x14 & 0x7fffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e129m25/feadd.c b/src/Specific/montgomery64_2e129m25/feadd.c
index 6bcbff963..1f4da6ce2 100644
--- a/src/Specific/montgomery64_2e129m25/feadd.c
+++ b/src/Specific/montgomery64_2e129m25/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x1, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e129m25/feaddDisplay.log b/src/Specific/montgomery64_2e129m25/feaddDisplay.log
index 080803494..429f30466 100644
--- a/src/Specific/montgomery64_2e129m25/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e129m25/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x1);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e129m25/femul.c b/src/Specific/montgomery64_2e129m25/femul.c
index a99ad6719..6e245304f 100644
--- a/src/Specific/montgomery64_2e129m25/femul.c
+++ b/src/Specific/montgomery64_2e129m25/femul.c
@@ -64,9 +64,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x177; uint8_t x178 = _subborrow_u64(x175, x167, 0xffffffffffffffffL, &x177);
   { uint64_t x180; uint8_t x181 = _subborrow_u64(x178, x170, 0x1, &x180);
   { uint64_t _; uint8_t x184 = _subborrow_u64(x181, x172, 0x0, &_);
-  { uint64_t x185 = cmovznz(x184, x180, x170);
-  { uint64_t x186 = cmovznz(x184, x177, x167);
-  { uint64_t x187 = cmovznz(x184, x174, x164);
+  { uint64_t x185 = cmovznz64(x184, x180, x170);
+  { uint64_t x186 = cmovznz64(x184, x177, x167);
+  { uint64_t x187 = cmovznz64(x184, x174, x164);
   out[0] = x187;
   out[1] = x186;
   out[2] = x185;
diff --git a/src/Specific/montgomery64_2e129m25/femulDisplay.log b/src/Specific/montgomery64_2e129m25/femulDisplay.log
index 4a6aac475..5e06221b0 100644
--- a/src/Specific/montgomery64_2e129m25/femulDisplay.log
+++ b/src/Specific/montgomery64_2e129m25/femulDisplay.log
@@ -61,9 +61,9 @@ Interp-η
  uint64_t x177, uint8_t x178 = subborrow_u64(x175, x167, 0xffffffffffffffffL);
  uint64_t x180, uint8_t x181 = subborrow_u64(x178, x170, 0x1);
  uint64_t _, uint8_t x184 = subborrow_u64(x181, x172, 0x0);
- uint64_t x185 = cmovznz(x184, x180, x170);
- uint64_t x186 = cmovznz(x184, x177, x167);
- uint64_t x187 = cmovznz(x184, x174, x164);
+ uint64_t x185 = cmovznz64(x184, x180, x170);
+ uint64_t x186 = cmovznz64(x184, x177, x167);
+ uint64_t x187 = cmovznz64(x184, x174, x164);
  return (x185, x186, x187))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e129m25/feopp.c b/src/Specific/montgomery64_2e129m25/feopp.c
index 1a4a5ed1c..57985379d 100644
--- a/src/Specific/montgomery64_2e129m25/feopp.c
+++ b/src/Specific/montgomery64_2e129m25/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xffffffffffffffe7L);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e129m25/feoppDisplay.log b/src/Specific/montgomery64_2e129m25/feoppDisplay.log
index 6bbda8d5c..e761bfab0 100644
--- a/src/Specific/montgomery64_2e129m25/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e129m25/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xffffffffffffffe7L);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e129m25/fesub.c b/src/Specific/montgomery64_2e129m25/fesub.c
index f2613260e..d31d91734 100644
--- a/src/Specific/montgomery64_2e129m25/fesub.c
+++ b/src/Specific/montgomery64_2e129m25/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xffffffffffffffe7L);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e129m25/fesubDisplay.log b/src/Specific/montgomery64_2e129m25/fesubDisplay.log
index fcafbbf04..b792af81b 100644
--- a/src/Specific/montgomery64_2e129m25/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e129m25/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xffffffffffffffe7L);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e130m5/feadd.c b/src/Specific/montgomery64_2e130m5/feadd.c
index 2618455df..fd76ff39c 100644
--- a/src/Specific/montgomery64_2e130m5/feadd.c
+++ b/src/Specific/montgomery64_2e130m5/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x3, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e130m5/feaddDisplay.log b/src/Specific/montgomery64_2e130m5/feaddDisplay.log
index 5e6d8ea8d..3490818b1 100644
--- a/src/Specific/montgomery64_2e130m5/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e130m5/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x3);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e130m5/femul.c b/src/Specific/montgomery64_2e130m5/femul.c
index 90e702349..fb6f4f400 100644
--- a/src/Specific/montgomery64_2e130m5/femul.c
+++ b/src/Specific/montgomery64_2e130m5/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x189; uint8_t x190 = _subborrow_u64(x187, x179, 0xffffffffffffffffL, &x189);
   { uint64_t x192; uint8_t x193 = _subborrow_u64(x190, x182, 0x3, &x192);
   { uint64_t _; uint8_t x196 = _subborrow_u64(x193, x184, 0x0, &_);
-  { uint64_t x197 = cmovznz(x196, x192, x182);
-  { uint64_t x198 = cmovznz(x196, x189, x179);
-  { uint64_t x199 = cmovznz(x196, x186, x176);
+  { uint64_t x197 = cmovznz64(x196, x192, x182);
+  { uint64_t x198 = cmovznz64(x196, x189, x179);
+  { uint64_t x199 = cmovznz64(x196, x186, x176);
   out[0] = x199;
   out[1] = x198;
   out[2] = x197;
diff --git a/src/Specific/montgomery64_2e130m5/femulDisplay.log b/src/Specific/montgomery64_2e130m5/femulDisplay.log
index fd9b3aba5..51f4abe94 100644
--- a/src/Specific/montgomery64_2e130m5/femulDisplay.log
+++ b/src/Specific/montgomery64_2e130m5/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x189, uint8_t x190 = subborrow_u64(x187, x179, 0xffffffffffffffffL);
  uint64_t x192, uint8_t x193 = subborrow_u64(x190, x182, 0x3);
  uint64_t _, uint8_t x196 = subborrow_u64(x193, x184, 0x0);
- uint64_t x197 = cmovznz(x196, x192, x182);
- uint64_t x198 = cmovznz(x196, x189, x179);
- uint64_t x199 = cmovznz(x196, x186, x176);
+ uint64_t x197 = cmovznz64(x196, x192, x182);
+ uint64_t x198 = cmovznz64(x196, x189, x179);
+ uint64_t x199 = cmovznz64(x196, x186, x176);
  return (x197, x198, x199))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e130m5/feopp.c b/src/Specific/montgomery64_2e130m5/feopp.c
index a96271cd8..5a36bd38d 100644
--- a/src/Specific/montgomery64_2e130m5/feopp.c
+++ b/src/Specific/montgomery64_2e130m5/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xfffffffffffffffbL);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e130m5/feoppDisplay.log b/src/Specific/montgomery64_2e130m5/feoppDisplay.log
index d45e7dbb0..d35231424 100644
--- a/src/Specific/montgomery64_2e130m5/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e130m5/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xfffffffffffffffbL);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e130m5/fesub.c b/src/Specific/montgomery64_2e130m5/fesub.c
index f0577c5d6..a7a5ad633 100644
--- a/src/Specific/montgomery64_2e130m5/fesub.c
+++ b/src/Specific/montgomery64_2e130m5/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xfffffffffffffffbL);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e130m5/fesubDisplay.log b/src/Specific/montgomery64_2e130m5/fesubDisplay.log
index 9af2265b1..28a5a458b 100644
--- a/src/Specific/montgomery64_2e130m5/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e130m5/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xfffffffffffffffbL);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e137m13/feadd.c b/src/Specific/montgomery64_2e137m13/feadd.c
index eaed15441..57dc9adb8 100644
--- a/src/Specific/montgomery64_2e137m13/feadd.c
+++ b/src/Specific/montgomery64_2e137m13/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x1ff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e137m13/feaddDisplay.log b/src/Specific/montgomery64_2e137m13/feaddDisplay.log
index de19cb349..656a4babe 100644
--- a/src/Specific/montgomery64_2e137m13/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e137m13/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x1ff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e137m13/femul.c b/src/Specific/montgomery64_2e137m13/femul.c
index 612f1f798..6c502e42a 100644
--- a/src/Specific/montgomery64_2e137m13/femul.c
+++ b/src/Specific/montgomery64_2e137m13/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x1ff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e137m13/femulDisplay.log b/src/Specific/montgomery64_2e137m13/femulDisplay.log
index 82d6adc29..04fb62766 100644
--- a/src/Specific/montgomery64_2e137m13/femulDisplay.log
+++ b/src/Specific/montgomery64_2e137m13/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x1ff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e137m13/feopp.c b/src/Specific/montgomery64_2e137m13/feopp.c
index b1e66f4a2..77448545e 100644
--- a/src/Specific/montgomery64_2e137m13/feopp.c
+++ b/src/Specific/montgomery64_2e137m13/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xfffffffffffffff3L);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e137m13/feoppDisplay.log b/src/Specific/montgomery64_2e137m13/feoppDisplay.log
index 1c9ee57fc..40ece040b 100644
--- a/src/Specific/montgomery64_2e137m13/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e137m13/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xfffffffffffffff3L);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e137m13/fesub.c b/src/Specific/montgomery64_2e137m13/fesub.c
index 36211f161..48eba5996 100644
--- a/src/Specific/montgomery64_2e137m13/fesub.c
+++ b/src/Specific/montgomery64_2e137m13/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xfffffffffffffff3L);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e137m13/fesubDisplay.log b/src/Specific/montgomery64_2e137m13/fesubDisplay.log
index a0d38a4d5..c9e562b56 100644
--- a/src/Specific/montgomery64_2e137m13/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e137m13/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xfffffffffffffff3L);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e140m27/feadd.c b/src/Specific/montgomery64_2e140m27/feadd.c
index 47f29dfd8..ef4942348 100644
--- a/src/Specific/montgomery64_2e140m27/feadd.c
+++ b/src/Specific/montgomery64_2e140m27/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0xfff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e140m27/feaddDisplay.log b/src/Specific/montgomery64_2e140m27/feaddDisplay.log
index dc97b15c1..f20421f20 100644
--- a/src/Specific/montgomery64_2e140m27/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e140m27/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0xfff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e140m27/femul.c b/src/Specific/montgomery64_2e140m27/femul.c
index 840d35b98..4668a124b 100644
--- a/src/Specific/montgomery64_2e140m27/femul.c
+++ b/src/Specific/montgomery64_2e140m27/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0xfff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e140m27/femulDisplay.log b/src/Specific/montgomery64_2e140m27/femulDisplay.log
index 6cd9c2233..3c21d92e6 100644
--- a/src/Specific/montgomery64_2e140m27/femulDisplay.log
+++ b/src/Specific/montgomery64_2e140m27/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0xfff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e140m27/feopp.c b/src/Specific/montgomery64_2e140m27/feopp.c
index 5cd210957..b0a35f3f6 100644
--- a/src/Specific/montgomery64_2e140m27/feopp.c
+++ b/src/Specific/montgomery64_2e140m27/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xffffffffffffffe5L);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e140m27/feoppDisplay.log b/src/Specific/montgomery64_2e140m27/feoppDisplay.log
index 0c054003d..1709ee6e4 100644
--- a/src/Specific/montgomery64_2e140m27/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e140m27/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xffffffffffffffe5L);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e140m27/fesub.c b/src/Specific/montgomery64_2e140m27/fesub.c
index b1fc13a20..f386086c1 100644
--- a/src/Specific/montgomery64_2e140m27/fesub.c
+++ b/src/Specific/montgomery64_2e140m27/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xffffffffffffffe5L);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e140m27/fesubDisplay.log b/src/Specific/montgomery64_2e140m27/fesubDisplay.log
index 1292ed8b5..7a2fde310 100644
--- a/src/Specific/montgomery64_2e140m27/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e140m27/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xffffffffffffffe5L);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e141m9/feadd.c b/src/Specific/montgomery64_2e141m9/feadd.c
index 8a09050f2..484a1128e 100644
--- a/src/Specific/montgomery64_2e141m9/feadd.c
+++ b/src/Specific/montgomery64_2e141m9/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x1fff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e141m9/feaddDisplay.log b/src/Specific/montgomery64_2e141m9/feaddDisplay.log
index f59787328..23d38a106 100644
--- a/src/Specific/montgomery64_2e141m9/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e141m9/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x1fff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e141m9/femul.c b/src/Specific/montgomery64_2e141m9/femul.c
index 1ef81a49b..2d0bf967e 100644
--- a/src/Specific/montgomery64_2e141m9/femul.c
+++ b/src/Specific/montgomery64_2e141m9/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x1fff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e141m9/femulDisplay.log b/src/Specific/montgomery64_2e141m9/femulDisplay.log
index 13ab5f145..55ed27c92 100644
--- a/src/Specific/montgomery64_2e141m9/femulDisplay.log
+++ b/src/Specific/montgomery64_2e141m9/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x1fff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e141m9/feopp.c b/src/Specific/montgomery64_2e141m9/feopp.c
index 03b985631..53662378d 100644
--- a/src/Specific/montgomery64_2e141m9/feopp.c
+++ b/src/Specific/montgomery64_2e141m9/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xfffffffffffffff7L);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e141m9/feoppDisplay.log b/src/Specific/montgomery64_2e141m9/feoppDisplay.log
index cce6750fe..e542a5f6c 100644
--- a/src/Specific/montgomery64_2e141m9/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e141m9/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xfffffffffffffff7L);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e141m9/fesub.c b/src/Specific/montgomery64_2e141m9/fesub.c
index c37a6757d..b0a285053 100644
--- a/src/Specific/montgomery64_2e141m9/fesub.c
+++ b/src/Specific/montgomery64_2e141m9/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xfffffffffffffff7L);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e141m9/fesubDisplay.log b/src/Specific/montgomery64_2e141m9/fesubDisplay.log
index 1f60da861..28e2d96ca 100644
--- a/src/Specific/montgomery64_2e141m9/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e141m9/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xfffffffffffffff7L);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e150m3/feadd.c b/src/Specific/montgomery64_2e150m3/feadd.c
index 7e035475b..f7bf1ae57 100644
--- a/src/Specific/montgomery64_2e150m3/feadd.c
+++ b/src/Specific/montgomery64_2e150m3/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x3fffff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e150m3/feaddDisplay.log b/src/Specific/montgomery64_2e150m3/feaddDisplay.log
index 83accb8c8..bf8484756 100644
--- a/src/Specific/montgomery64_2e150m3/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e150m3/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x3fffff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e150m3/femul.c b/src/Specific/montgomery64_2e150m3/femul.c
index bb3e619b1..e6c781e6d 100644
--- a/src/Specific/montgomery64_2e150m3/femul.c
+++ b/src/Specific/montgomery64_2e150m3/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x3fffff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e150m3/femulDisplay.log b/src/Specific/montgomery64_2e150m3/femulDisplay.log
index 4c63edcc7..e0c671325 100644
--- a/src/Specific/montgomery64_2e150m3/femulDisplay.log
+++ b/src/Specific/montgomery64_2e150m3/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x3fffff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e150m3/feopp.c b/src/Specific/montgomery64_2e150m3/feopp.c
index 71d501063..d70d226e0 100644
--- a/src/Specific/montgomery64_2e150m3/feopp.c
+++ b/src/Specific/montgomery64_2e150m3/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xfffffffffffffffdL);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e150m3/feoppDisplay.log b/src/Specific/montgomery64_2e150m3/feoppDisplay.log
index a3837286e..557bc3a13 100644
--- a/src/Specific/montgomery64_2e150m3/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e150m3/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xfffffffffffffffdL);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e150m3/fesub.c b/src/Specific/montgomery64_2e150m3/fesub.c
index 8a186256c..f25324f92 100644
--- a/src/Specific/montgomery64_2e150m3/fesub.c
+++ b/src/Specific/montgomery64_2e150m3/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xfffffffffffffffdL);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e150m3/fesubDisplay.log b/src/Specific/montgomery64_2e150m3/fesubDisplay.log
index f5aa1f66a..11c135bd2 100644
--- a/src/Specific/montgomery64_2e150m3/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e150m3/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xfffffffffffffffdL);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e150m5/feadd.c b/src/Specific/montgomery64_2e150m5/feadd.c
index 946523de3..0b31721e5 100644
--- a/src/Specific/montgomery64_2e150m5/feadd.c
+++ b/src/Specific/montgomery64_2e150m5/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x3fffff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e150m5/feaddDisplay.log b/src/Specific/montgomery64_2e150m5/feaddDisplay.log
index 4cbd25f92..654bbedc7 100644
--- a/src/Specific/montgomery64_2e150m5/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e150m5/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x3fffff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e150m5/femul.c b/src/Specific/montgomery64_2e150m5/femul.c
index a8aa30740..0ae71da39 100644
--- a/src/Specific/montgomery64_2e150m5/femul.c
+++ b/src/Specific/montgomery64_2e150m5/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x3fffff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e150m5/femulDisplay.log b/src/Specific/montgomery64_2e150m5/femulDisplay.log
index a0df142b9..ea386329f 100644
--- a/src/Specific/montgomery64_2e150m5/femulDisplay.log
+++ b/src/Specific/montgomery64_2e150m5/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x3fffff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e150m5/feopp.c b/src/Specific/montgomery64_2e150m5/feopp.c
index 7546be8c5..f0bb881e1 100644
--- a/src/Specific/montgomery64_2e150m5/feopp.c
+++ b/src/Specific/montgomery64_2e150m5/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xfffffffffffffffbL);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e150m5/feoppDisplay.log b/src/Specific/montgomery64_2e150m5/feoppDisplay.log
index 700b215c7..beeba9404 100644
--- a/src/Specific/montgomery64_2e150m5/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e150m5/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xfffffffffffffffbL);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e150m5/fesub.c b/src/Specific/montgomery64_2e150m5/fesub.c
index 2309ec81d..ee9031dc5 100644
--- a/src/Specific/montgomery64_2e150m5/fesub.c
+++ b/src/Specific/montgomery64_2e150m5/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xfffffffffffffffbL);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e150m5/fesubDisplay.log b/src/Specific/montgomery64_2e150m5/fesubDisplay.log
index 83d7110e8..1455a0777 100644
--- a/src/Specific/montgomery64_2e150m5/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e150m5/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xfffffffffffffffbL);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e152m17/feadd.c b/src/Specific/montgomery64_2e152m17/feadd.c
index bf1578506..b280cb729 100644
--- a/src/Specific/montgomery64_2e152m17/feadd.c
+++ b/src/Specific/montgomery64_2e152m17/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0xffffff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e152m17/feaddDisplay.log b/src/Specific/montgomery64_2e152m17/feaddDisplay.log
index e9c2b55c4..3c1c0d937 100644
--- a/src/Specific/montgomery64_2e152m17/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e152m17/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0xffffff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e152m17/femul.c b/src/Specific/montgomery64_2e152m17/femul.c
index 69b22d21f..401222097 100644
--- a/src/Specific/montgomery64_2e152m17/femul.c
+++ b/src/Specific/montgomery64_2e152m17/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0xffffff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e152m17/femulDisplay.log b/src/Specific/montgomery64_2e152m17/femulDisplay.log
index ea7aec179..6c3eb91fb 100644
--- a/src/Specific/montgomery64_2e152m17/femulDisplay.log
+++ b/src/Specific/montgomery64_2e152m17/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0xffffff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e152m17/feopp.c b/src/Specific/montgomery64_2e152m17/feopp.c
index 02f99f04d..cbf79bcda 100644
--- a/src/Specific/montgomery64_2e152m17/feopp.c
+++ b/src/Specific/montgomery64_2e152m17/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xffffffffffffffefL);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e152m17/feoppDisplay.log b/src/Specific/montgomery64_2e152m17/feoppDisplay.log
index bb0770d68..e27602ec5 100644
--- a/src/Specific/montgomery64_2e152m17/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e152m17/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xffffffffffffffefL);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e152m17/fesub.c b/src/Specific/montgomery64_2e152m17/fesub.c
index c841d52c1..81ae44d47 100644
--- a/src/Specific/montgomery64_2e152m17/fesub.c
+++ b/src/Specific/montgomery64_2e152m17/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xffffffffffffffefL);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e152m17/fesubDisplay.log b/src/Specific/montgomery64_2e152m17/fesubDisplay.log
index 95a542abd..3d107ab03 100644
--- a/src/Specific/montgomery64_2e152m17/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e152m17/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xffffffffffffffefL);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e158m15/feadd.c b/src/Specific/montgomery64_2e158m15/feadd.c
index 96890e2c8..686fa28f6 100644
--- a/src/Specific/montgomery64_2e158m15/feadd.c
+++ b/src/Specific/montgomery64_2e158m15/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x3fffffff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e158m15/feaddDisplay.log b/src/Specific/montgomery64_2e158m15/feaddDisplay.log
index a8a55c143..e58fcd683 100644
--- a/src/Specific/montgomery64_2e158m15/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e158m15/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x3fffffff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e158m15/femul.c b/src/Specific/montgomery64_2e158m15/femul.c
index d6315cc25..d83532e8a 100644
--- a/src/Specific/montgomery64_2e158m15/femul.c
+++ b/src/Specific/montgomery64_2e158m15/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x3fffffff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e158m15/femulDisplay.log b/src/Specific/montgomery64_2e158m15/femulDisplay.log
index 2d0e71281..d982c5b1b 100644
--- a/src/Specific/montgomery64_2e158m15/femulDisplay.log
+++ b/src/Specific/montgomery64_2e158m15/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x3fffffff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e158m15/feopp.c b/src/Specific/montgomery64_2e158m15/feopp.c
index 16324eab8..ded084772 100644
--- a/src/Specific/montgomery64_2e158m15/feopp.c
+++ b/src/Specific/montgomery64_2e158m15/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xfffffffffffffff1L);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e158m15/feoppDisplay.log b/src/Specific/montgomery64_2e158m15/feoppDisplay.log
index 4a566ecf8..958bc93f4 100644
--- a/src/Specific/montgomery64_2e158m15/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e158m15/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xfffffffffffffff1L);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e158m15/fesub.c b/src/Specific/montgomery64_2e158m15/fesub.c
index 227281c23..793809f57 100644
--- a/src/Specific/montgomery64_2e158m15/fesub.c
+++ b/src/Specific/montgomery64_2e158m15/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xfffffffffffffff1L);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e158m15/fesubDisplay.log b/src/Specific/montgomery64_2e158m15/fesubDisplay.log
index 254bdc290..5539940ca 100644
--- a/src/Specific/montgomery64_2e158m15/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e158m15/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xfffffffffffffff1L);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e165m25/feadd.c b/src/Specific/montgomery64_2e165m25/feadd.c
index ce0d47446..8fd844560 100644
--- a/src/Specific/montgomery64_2e165m25/feadd.c
+++ b/src/Specific/montgomery64_2e165m25/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x1fffffffff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e165m25/feaddDisplay.log b/src/Specific/montgomery64_2e165m25/feaddDisplay.log
index fc87b514c..909d6bf32 100644
--- a/src/Specific/montgomery64_2e165m25/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e165m25/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x1fffffffff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e165m25/femul.c b/src/Specific/montgomery64_2e165m25/femul.c
index 2b7ac00dc..1a40a737b 100644
--- a/src/Specific/montgomery64_2e165m25/femul.c
+++ b/src/Specific/montgomery64_2e165m25/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x1fffffffff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e165m25/femulDisplay.log b/src/Specific/montgomery64_2e165m25/femulDisplay.log
index 5eee0b825..695ddce41 100644
--- a/src/Specific/montgomery64_2e165m25/femulDisplay.log
+++ b/src/Specific/montgomery64_2e165m25/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x1fffffffff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e165m25/feopp.c b/src/Specific/montgomery64_2e165m25/feopp.c
index 0628a94cd..fbb4ed8d5 100644
--- a/src/Specific/montgomery64_2e165m25/feopp.c
+++ b/src/Specific/montgomery64_2e165m25/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xffffffffffffffe7L);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e165m25/feoppDisplay.log b/src/Specific/montgomery64_2e165m25/feoppDisplay.log
index df3710bc6..c82d3098f 100644
--- a/src/Specific/montgomery64_2e165m25/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e165m25/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xffffffffffffffe7L);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e165m25/fesub.c b/src/Specific/montgomery64_2e165m25/fesub.c
index 4484a9f3f..b7cec3891 100644
--- a/src/Specific/montgomery64_2e165m25/fesub.c
+++ b/src/Specific/montgomery64_2e165m25/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xffffffffffffffe7L);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e165m25/fesubDisplay.log b/src/Specific/montgomery64_2e165m25/fesubDisplay.log
index 307735031..505664e2b 100644
--- a/src/Specific/montgomery64_2e165m25/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e165m25/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xffffffffffffffe7L);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e166m5/feadd.c b/src/Specific/montgomery64_2e166m5/feadd.c
index 507af03c8..ddd0e590c 100644
--- a/src/Specific/montgomery64_2e166m5/feadd.c
+++ b/src/Specific/montgomery64_2e166m5/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x3fffffffff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e166m5/feaddDisplay.log b/src/Specific/montgomery64_2e166m5/feaddDisplay.log
index 1080b06f7..91dc59768 100644
--- a/src/Specific/montgomery64_2e166m5/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e166m5/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x3fffffffff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e166m5/femul.c b/src/Specific/montgomery64_2e166m5/femul.c
index c86f09815..90f8a9ba1 100644
--- a/src/Specific/montgomery64_2e166m5/femul.c
+++ b/src/Specific/montgomery64_2e166m5/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x3fffffffff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e166m5/femulDisplay.log b/src/Specific/montgomery64_2e166m5/femulDisplay.log
index 4f95b89d5..71c77bb01 100644
--- a/src/Specific/montgomery64_2e166m5/femulDisplay.log
+++ b/src/Specific/montgomery64_2e166m5/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x3fffffffff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e166m5/feopp.c b/src/Specific/montgomery64_2e166m5/feopp.c
index c20635533..c99dc61d8 100644
--- a/src/Specific/montgomery64_2e166m5/feopp.c
+++ b/src/Specific/montgomery64_2e166m5/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xfffffffffffffffbL);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e166m5/feoppDisplay.log b/src/Specific/montgomery64_2e166m5/feoppDisplay.log
index a671912f3..e58f8f51f 100644
--- a/src/Specific/montgomery64_2e166m5/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e166m5/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xfffffffffffffffbL);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e166m5/fesub.c b/src/Specific/montgomery64_2e166m5/fesub.c
index 73060c9a2..f4c87ad6d 100644
--- a/src/Specific/montgomery64_2e166m5/fesub.c
+++ b/src/Specific/montgomery64_2e166m5/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xfffffffffffffffbL);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e166m5/fesubDisplay.log b/src/Specific/montgomery64_2e166m5/fesubDisplay.log
index 9a8131f04..3ab9ec12d 100644
--- a/src/Specific/montgomery64_2e166m5/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e166m5/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xfffffffffffffffbL);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e171m19/feadd.c b/src/Specific/montgomery64_2e171m19/feadd.c
index 080d2395e..cfc2a28d9 100644
--- a/src/Specific/montgomery64_2e171m19/feadd.c
+++ b/src/Specific/montgomery64_2e171m19/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x7ffffffffff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e171m19/feaddDisplay.log b/src/Specific/montgomery64_2e171m19/feaddDisplay.log
index 7ef077d0e..e1dee8a70 100644
--- a/src/Specific/montgomery64_2e171m19/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e171m19/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x7ffffffffff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e171m19/femul.c b/src/Specific/montgomery64_2e171m19/femul.c
index c6633c047..f48dbe98d 100644
--- a/src/Specific/montgomery64_2e171m19/femul.c
+++ b/src/Specific/montgomery64_2e171m19/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x7ffffffffff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e171m19/femulDisplay.log b/src/Specific/montgomery64_2e171m19/femulDisplay.log
index 954f6af87..1025fdd76 100644
--- a/src/Specific/montgomery64_2e171m19/femulDisplay.log
+++ b/src/Specific/montgomery64_2e171m19/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x7ffffffffff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e171m19/feopp.c b/src/Specific/montgomery64_2e171m19/feopp.c
index f6798e8ea..e62a4e9b6 100644
--- a/src/Specific/montgomery64_2e171m19/feopp.c
+++ b/src/Specific/montgomery64_2e171m19/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xffffffffffffffedL);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e171m19/feoppDisplay.log b/src/Specific/montgomery64_2e171m19/feoppDisplay.log
index 135f3d1ec..4c3fc354d 100644
--- a/src/Specific/montgomery64_2e171m19/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e171m19/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xffffffffffffffedL);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e171m19/fesub.c b/src/Specific/montgomery64_2e171m19/fesub.c
index 0ad3de872..dc95081fa 100644
--- a/src/Specific/montgomery64_2e171m19/fesub.c
+++ b/src/Specific/montgomery64_2e171m19/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xffffffffffffffedL);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e171m19/fesubDisplay.log b/src/Specific/montgomery64_2e171m19/fesubDisplay.log
index f6089aa83..aa902b08f 100644
--- a/src/Specific/montgomery64_2e171m19/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e171m19/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xffffffffffffffedL);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e174m17/feadd.c b/src/Specific/montgomery64_2e174m17/feadd.c
index 77590f27c..0b55b0a1f 100644
--- a/src/Specific/montgomery64_2e174m17/feadd.c
+++ b/src/Specific/montgomery64_2e174m17/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x3fffffffffff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e174m17/feaddDisplay.log b/src/Specific/montgomery64_2e174m17/feaddDisplay.log
index 016b4ecbd..8e63c8563 100644
--- a/src/Specific/montgomery64_2e174m17/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e174m17/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x3fffffffffff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e174m17/femul.c b/src/Specific/montgomery64_2e174m17/femul.c
index 91d068ac8..1b4daae65 100644
--- a/src/Specific/montgomery64_2e174m17/femul.c
+++ b/src/Specific/montgomery64_2e174m17/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x3fffffffffff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e174m17/femulDisplay.log b/src/Specific/montgomery64_2e174m17/femulDisplay.log
index 958dfc056..8fbd68327 100644
--- a/src/Specific/montgomery64_2e174m17/femulDisplay.log
+++ b/src/Specific/montgomery64_2e174m17/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x3fffffffffff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e174m17/feopp.c b/src/Specific/montgomery64_2e174m17/feopp.c
index 2e095e15d..9702a946c 100644
--- a/src/Specific/montgomery64_2e174m17/feopp.c
+++ b/src/Specific/montgomery64_2e174m17/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xffffffffffffffefL);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e174m17/feoppDisplay.log b/src/Specific/montgomery64_2e174m17/feoppDisplay.log
index c82d6fedc..c3b02e611 100644
--- a/src/Specific/montgomery64_2e174m17/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e174m17/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xffffffffffffffefL);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e174m17/fesub.c b/src/Specific/montgomery64_2e174m17/fesub.c
index fa05c1792..8c618bdcc 100644
--- a/src/Specific/montgomery64_2e174m17/fesub.c
+++ b/src/Specific/montgomery64_2e174m17/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xffffffffffffffefL);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e174m17/fesubDisplay.log b/src/Specific/montgomery64_2e174m17/fesubDisplay.log
index d7b76bfb8..5274fa01c 100644
--- a/src/Specific/montgomery64_2e174m17/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e174m17/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xffffffffffffffefL);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e174m3/feadd.c b/src/Specific/montgomery64_2e174m3/feadd.c
index af34d80c4..3d83e59ed 100644
--- a/src/Specific/montgomery64_2e174m3/feadd.c
+++ b/src/Specific/montgomery64_2e174m3/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x3fffffffffff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e174m3/feaddDisplay.log b/src/Specific/montgomery64_2e174m3/feaddDisplay.log
index 8b144a28e..c559ecee4 100644
--- a/src/Specific/montgomery64_2e174m3/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e174m3/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x3fffffffffff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e174m3/femul.c b/src/Specific/montgomery64_2e174m3/femul.c
index 84481c785..ae9801d21 100644
--- a/src/Specific/montgomery64_2e174m3/femul.c
+++ b/src/Specific/montgomery64_2e174m3/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x3fffffffffff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e174m3/femulDisplay.log b/src/Specific/montgomery64_2e174m3/femulDisplay.log
index 25d9ffc2f..e8cea29ab 100644
--- a/src/Specific/montgomery64_2e174m3/femulDisplay.log
+++ b/src/Specific/montgomery64_2e174m3/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x3fffffffffff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e174m3/feopp.c b/src/Specific/montgomery64_2e174m3/feopp.c
index bc3c5bdf1..19ee56f31 100644
--- a/src/Specific/montgomery64_2e174m3/feopp.c
+++ b/src/Specific/montgomery64_2e174m3/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xfffffffffffffffdL);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e174m3/feoppDisplay.log b/src/Specific/montgomery64_2e174m3/feoppDisplay.log
index ce01ba233..1990945e3 100644
--- a/src/Specific/montgomery64_2e174m3/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e174m3/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xfffffffffffffffdL);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e174m3/fesub.c b/src/Specific/montgomery64_2e174m3/fesub.c
index 619fe8917..d92e16d29 100644
--- a/src/Specific/montgomery64_2e174m3/fesub.c
+++ b/src/Specific/montgomery64_2e174m3/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xfffffffffffffffdL);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e174m3/fesubDisplay.log b/src/Specific/montgomery64_2e174m3/fesubDisplay.log
index 4ec7fc8c6..06cc33bbf 100644
--- a/src/Specific/montgomery64_2e174m3/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e174m3/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xfffffffffffffffdL);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e189m25/feadd.c b/src/Specific/montgomery64_2e189m25/feadd.c
index 349f4d564..297cd9cbc 100644
--- a/src/Specific/montgomery64_2e189m25/feadd.c
+++ b/src/Specific/montgomery64_2e189m25/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x1fffffffffffffff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e189m25/feaddDisplay.log b/src/Specific/montgomery64_2e189m25/feaddDisplay.log
index c1b4af910..831ce8317 100644
--- a/src/Specific/montgomery64_2e189m25/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e189m25/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x1fffffffffffffff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e189m25/femul.c b/src/Specific/montgomery64_2e189m25/femul.c
index a757e29a7..c5a3d4492 100644
--- a/src/Specific/montgomery64_2e189m25/femul.c
+++ b/src/Specific/montgomery64_2e189m25/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x1fffffffffffffff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e189m25/femulDisplay.log b/src/Specific/montgomery64_2e189m25/femulDisplay.log
index 1df6b6ede..d0507df07 100644
--- a/src/Specific/montgomery64_2e189m25/femulDisplay.log
+++ b/src/Specific/montgomery64_2e189m25/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x1fffffffffffffff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e189m25/feopp.c b/src/Specific/montgomery64_2e189m25/feopp.c
index e30928d40..acef14dec 100644
--- a/src/Specific/montgomery64_2e189m25/feopp.c
+++ b/src/Specific/montgomery64_2e189m25/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xffffffffffffffe7L);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e189m25/feoppDisplay.log b/src/Specific/montgomery64_2e189m25/feoppDisplay.log
index a26b4380d..c11948d1e 100644
--- a/src/Specific/montgomery64_2e189m25/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e189m25/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xffffffffffffffe7L);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e189m25/fesub.c b/src/Specific/montgomery64_2e189m25/fesub.c
index 475de3c15..9959078f0 100644
--- a/src/Specific/montgomery64_2e189m25/fesub.c
+++ b/src/Specific/montgomery64_2e189m25/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xffffffffffffffe7L);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e189m25/fesubDisplay.log b/src/Specific/montgomery64_2e189m25/fesubDisplay.log
index d1288ae65..692e6a34c 100644
--- a/src/Specific/montgomery64_2e189m25/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e189m25/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xffffffffffffffe7L);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e190m11/feadd.c b/src/Specific/montgomery64_2e190m11/feadd.c
index f1b4f1922..8b2ff0c3f 100644
--- a/src/Specific/montgomery64_2e190m11/feadd.c
+++ b/src/Specific/montgomery64_2e190m11/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x3fffffffffffffff, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e190m11/feaddDisplay.log b/src/Specific/montgomery64_2e190m11/feaddDisplay.log
index ac42a333d..f6f352aec 100644
--- a/src/Specific/montgomery64_2e190m11/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e190m11/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x3fffffffffffffff);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e190m11/femul.c b/src/Specific/montgomery64_2e190m11/femul.c
index 824773dee..0119b01ed 100644
--- a/src/Specific/montgomery64_2e190m11/femul.c
+++ b/src/Specific/montgomery64_2e190m11/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x3fffffffffffffff, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e190m11/femulDisplay.log b/src/Specific/montgomery64_2e190m11/femulDisplay.log
index 37c884311..185717349 100644
--- a/src/Specific/montgomery64_2e190m11/femulDisplay.log
+++ b/src/Specific/montgomery64_2e190m11/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x3fffffffffffffff);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e190m11/feopp.c b/src/Specific/montgomery64_2e190m11/feopp.c
index 082a54eb9..bb4485f74 100644
--- a/src/Specific/montgomery64_2e190m11/feopp.c
+++ b/src/Specific/montgomery64_2e190m11/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xfffffffffffffff5L);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e190m11/feoppDisplay.log b/src/Specific/montgomery64_2e190m11/feoppDisplay.log
index 12e86a5c1..9fdeaa269 100644
--- a/src/Specific/montgomery64_2e190m11/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e190m11/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xfffffffffffffff5L);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e190m11/fesub.c b/src/Specific/montgomery64_2e190m11/fesub.c
index 709d49d56..a88dac55b 100644
--- a/src/Specific/montgomery64_2e190m11/fesub.c
+++ b/src/Specific/montgomery64_2e190m11/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xfffffffffffffff5L);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e190m11/fesubDisplay.log b/src/Specific/montgomery64_2e190m11/fesubDisplay.log
index 4316675a9..152265c89 100644
--- a/src/Specific/montgomery64_2e190m11/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e190m11/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xfffffffffffffff5L);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e191m19/feadd.c b/src/Specific/montgomery64_2e191m19/feadd.c
index 273495250..3139704bc 100644
--- a/src/Specific/montgomery64_2e191m19/feadd.c
+++ b/src/Specific/montgomery64_2e191m19/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xffffffffffffffffL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0x7fffffffffffffffL, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e191m19/feaddDisplay.log b/src/Specific/montgomery64_2e191m19/feaddDisplay.log
index 45da76a73..0ebc92482 100644
--- a/src/Specific/montgomery64_2e191m19/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e191m19/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xffffffffffffffffL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e191m19/femul.c b/src/Specific/montgomery64_2e191m19/femul.c
index 2bb56c397..df68f86c4 100644
--- a/src/Specific/montgomery64_2e191m19/femul.c
+++ b/src/Specific/montgomery64_2e191m19/femul.c
@@ -70,9 +70,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x195; uint8_t x196 = _subborrow_u64(x193, x185, 0xffffffffffffffffL, &x195);
   { uint64_t x198; uint8_t x199 = _subborrow_u64(x196, x188, 0x7fffffffffffffffL, &x198);
   { uint64_t _; uint8_t x202 = _subborrow_u64(x199, x190, 0x0, &_);
-  { uint64_t x203 = cmovznz(x202, x198, x188);
-  { uint64_t x204 = cmovznz(x202, x195, x185);
-  { uint64_t x205 = cmovznz(x202, x192, x182);
+  { uint64_t x203 = cmovznz64(x202, x198, x188);
+  { uint64_t x204 = cmovznz64(x202, x195, x185);
+  { uint64_t x205 = cmovznz64(x202, x192, x182);
   out[0] = x205;
   out[1] = x204;
   out[2] = x203;
diff --git a/src/Specific/montgomery64_2e191m19/femulDisplay.log b/src/Specific/montgomery64_2e191m19/femulDisplay.log
index 754c0aeb1..0534b16de 100644
--- a/src/Specific/montgomery64_2e191m19/femulDisplay.log
+++ b/src/Specific/montgomery64_2e191m19/femulDisplay.log
@@ -67,9 +67,9 @@ Interp-η
  uint64_t x195, uint8_t x196 = subborrow_u64(x193, x185, 0xffffffffffffffffL);
  uint64_t x198, uint8_t x199 = subborrow_u64(x196, x188, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x202 = subborrow_u64(x199, x190, 0x0);
- uint64_t x203 = cmovznz(x202, x198, x188);
- uint64_t x204 = cmovznz(x202, x195, x185);
- uint64_t x205 = cmovznz(x202, x192, x182);
+ uint64_t x203 = cmovznz64(x202, x198, x188);
+ uint64_t x204 = cmovznz64(x202, x195, x185);
+ uint64_t x205 = cmovznz64(x202, x192, x182);
  return (x203, x204, x205))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e191m19/feopp.c b/src/Specific/montgomery64_2e191m19/feopp.c
index 603f84e85..9c2e12b67 100644
--- a/src/Specific/montgomery64_2e191m19/feopp.c
+++ b/src/Specific/montgomery64_2e191m19/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xffffffffffffffedL);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e191m19/feoppDisplay.log b/src/Specific/montgomery64_2e191m19/feoppDisplay.log
index f84d48a44..3b72f2aea 100644
--- a/src/Specific/montgomery64_2e191m19/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e191m19/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xffffffffffffffedL);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e191m19/fesub.c b/src/Specific/montgomery64_2e191m19/fesub.c
index ec64f7e84..e6683bd03 100644
--- a/src/Specific/montgomery64_2e191m19/fesub.c
+++ b/src/Specific/montgomery64_2e191m19/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xffffffffffffffedL);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e191m19/fesubDisplay.log b/src/Specific/montgomery64_2e191m19/fesubDisplay.log
index e152b654c..0a4d49441 100644
--- a/src/Specific/montgomery64_2e191m19/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e191m19/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xffffffffffffffedL);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e192m2e64m1/feadd.c b/src/Specific/montgomery64_2e192m2e64m1/feadd.c
index 8f89a89db..b46c6c8d6 100644
--- a/src/Specific/montgomery64_2e192m2e64m1/feadd.c
+++ b/src/Specific/montgomery64_2e192m2e64m1/feadd.c
@@ -12,9 +12,9 @@ static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x25; uint8_t x26 = _subborrow_u64(x23, x16, 0xfffffffffffffffeL, &x25);
   { uint64_t x28; uint8_t x29 = _subborrow_u64(x26, x19, 0xffffffffffffffffL, &x28);
   { uint64_t _; uint8_t x32 = _subborrow_u64(x29, x20, 0x0, &_);
-  { uint64_t x33 = cmovznz(x32, x28, x19);
-  { uint64_t x34 = cmovznz(x32, x25, x16);
-  { uint64_t x35 = cmovznz(x32, x22, x13);
+  { uint64_t x33 = cmovznz64(x32, x28, x19);
+  { uint64_t x34 = cmovznz64(x32, x25, x16);
+  { uint64_t x35 = cmovznz64(x32, x22, x13);
   out[0] = x35;
   out[1] = x34;
   out[2] = x33;
diff --git a/src/Specific/montgomery64_2e192m2e64m1/feaddDisplay.log b/src/Specific/montgomery64_2e192m2e64m1/feaddDisplay.log
index d61da57ab..6ab76e5b9 100644
--- a/src/Specific/montgomery64_2e192m2e64m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e192m2e64m1/feaddDisplay.log
@@ -9,9 +9,9 @@ Interp-η
  uint64_t x25, uint8_t x26 = subborrow_u64(x23, x16, 0xfffffffffffffffeL);
  uint64_t x28, uint8_t x29 = subborrow_u64(x26, x19, 0xffffffffffffffffL);
  uint64_t _, uint8_t x32 = subborrow_u64(x29, x20, 0x0);
- uint64_t x33 = cmovznz(x32, x28, x19);
- uint64_t x34 = cmovznz(x32, x25, x16);
- uint64_t x35 = cmovznz(x32, x22, x13);
+ uint64_t x33 = cmovznz64(x32, x28, x19);
+ uint64_t x34 = cmovznz64(x32, x25, x16);
+ uint64_t x35 = cmovznz64(x32, x22, x13);
  return (x33, x34, x35))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e192m2e64m1/femul.c b/src/Specific/montgomery64_2e192m2e64m1/femul.c
index 08168931a..aea170aaa 100644
--- a/src/Specific/montgomery64_2e192m2e64m1/femul.c
+++ b/src/Specific/montgomery64_2e192m2e64m1/femul.c
@@ -67,9 +67,9 @@ static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x186; uint8_t x187 = _subborrow_u64(x184, x176, 0xfffffffffffffffeL, &x186);
   { uint64_t x189; uint8_t x190 = _subborrow_u64(x187, x179, 0xffffffffffffffffL, &x189);
   { uint64_t _; uint8_t x193 = _subborrow_u64(x190, x181, 0x0, &_);
-  { uint64_t x194 = cmovznz(x193, x189, x179);
-  { uint64_t x195 = cmovznz(x193, x186, x176);
-  { uint64_t x196 = cmovznz(x193, x183, x173);
+  { uint64_t x194 = cmovznz64(x193, x189, x179);
+  { uint64_t x195 = cmovznz64(x193, x186, x176);
+  { uint64_t x196 = cmovznz64(x193, x183, x173);
   out[0] = x196;
   out[1] = x195;
   out[2] = x194;
diff --git a/src/Specific/montgomery64_2e192m2e64m1/femulDisplay.log b/src/Specific/montgomery64_2e192m2e64m1/femulDisplay.log
index be35fd359..7607e6c7f 100644
--- a/src/Specific/montgomery64_2e192m2e64m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e192m2e64m1/femulDisplay.log
@@ -64,9 +64,9 @@ Interp-η
  uint64_t x186, uint8_t x187 = subborrow_u64(x184, x176, 0xfffffffffffffffeL);
  uint64_t x189, uint8_t x190 = subborrow_u64(x187, x179, 0xffffffffffffffffL);
  uint64_t _, uint8_t x193 = subborrow_u64(x190, x181, 0x0);
- uint64_t x194 = cmovznz(x193, x189, x179);
- uint64_t x195 = cmovznz(x193, x186, x176);
- uint64_t x196 = cmovznz(x193, x183, x173);
+ uint64_t x194 = cmovznz64(x193, x189, x179);
+ uint64_t x195 = cmovznz64(x193, x186, x176);
+ uint64_t x196 = cmovznz64(x193, x183, x173);
  return (x194, x195, x196))
 (x, x0)%core
      : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e192m2e64m1/feopp.c b/src/Specific/montgomery64_2e192m2e64m1/feopp.c
index ff340f966..13a4cb613 100644
--- a/src/Specific/montgomery64_2e192m2e64m1/feopp.c
+++ b/src/Specific/montgomery64_2e192m2e64m1/feopp.c
@@ -5,7 +5,7 @@ static void feopp(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6; uint8_t x7 = _subborrow_u64(0x0, 0x0, x2, &x6);
   { uint64_t x9; uint8_t x10 = _subborrow_u64(x7, 0x0, x4, &x9);
   { uint64_t x12; uint8_t x13 = _subborrow_u64(x10, 0x0, x3, &x12);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xffffffffffffffffL);
   { uint64_t x17; uint8_t x18 = _addcarryx_u64(0x0, x6, x15, &x17);
   { uint64_t x19 = (x14 & 0xfffffffffffffffeL);
diff --git a/src/Specific/montgomery64_2e192m2e64m1/feoppDisplay.log b/src/Specific/montgomery64_2e192m2e64m1/feoppDisplay.log
index d55567ccf..130eb71da 100644
--- a/src/Specific/montgomery64_2e192m2e64m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e192m2e64m1/feoppDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = subborrow_u64(0x0, 0x0, x2);
  uint64_t x9, uint8_t x10 = subborrow_u64(x7, 0x0, x4);
  uint64_t x12, uint8_t x13 = subborrow_u64(x10, 0x0, x3);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xffffffffffffffffL);
  uint64_t x17, uint8_t x18 = addcarryx_u64(0x0, x6, x15);
  uint64_t x19 = (x14 & 0xfffffffffffffffeL);
diff --git a/src/Specific/montgomery64_2e192m2e64m1/fesub.c b/src/Specific/montgomery64_2e192m2e64m1/fesub.c
index a5b851fbc..5ccff56fb 100644
--- a/src/Specific/montgomery64_2e192m2e64m1/fesub.c
+++ b/src/Specific/montgomery64_2e192m2e64m1/fesub.c
@@ -8,7 +8,7 @@ static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3])
   { uint64_t x13; uint8_t x14 = _subborrow_u64(0x0, x5, x9, &x13);
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, x7, x11, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, x6, x10, &x19);
-  { uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+  { uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
   { uint64_t x22 = (x21 & 0xffffffffffffffffL);
   { uint64_t x24; uint8_t x25 = _addcarryx_u64(0x0, x13, x22, &x24);
   { uint64_t x26 = (x21 & 0xfffffffffffffffeL);
diff --git a/src/Specific/montgomery64_2e192m2e64m1/fesubDisplay.log b/src/Specific/montgomery64_2e192m2e64m1/fesubDisplay.log
index 737bc5b9e..d0da94fa8 100644
--- a/src/Specific/montgomery64_2e192m2e64m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e192m2e64m1/fesubDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x13, uint8_t x14 = subborrow_u64(0x0, x5, x9);
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, x7, x11);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, x6, x10);
- uint64_t x21 = (uint64_t)cmovznz(x20, 0x0, 0xffffffffffffffffL);
+ uint64_t x21 = cmovznz64(x20, 0x0, 0xffffffffffffffffL);
  uint64_t x22 = (x21 & 0xffffffffffffffffL);
  uint64_t x24, uint8_t x25 = addcarryx_u64(0x0, x13, x22);
  uint64_t x26 = (x21 & 0xfffffffffffffffeL);
diff --git a/src/Specific/montgomery64_2e194m33/feadd.c b/src/Specific/montgomery64_2e194m33/feadd.c
index 5640ec8b8..ac925e7c3 100644
--- a/src/Specific/montgomery64_2e194m33/feadd.c
+++ b/src/Specific/montgomery64_2e194m33/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x3, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e194m33/feaddDisplay.log b/src/Specific/montgomery64_2e194m33/feaddDisplay.log
index 630c73961..031dc3bf4 100644
--- a/src/Specific/montgomery64_2e194m33/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e194m33/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x3);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e194m33/femul.c b/src/Specific/montgomery64_2e194m33/femul.c
index ead21d7d1..273eabe04 100644
--- a/src/Specific/montgomery64_2e194m33/femul.c
+++ b/src/Specific/montgomery64_2e194m33/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x327; uint8_t x328 = _subborrow_u64(x325, x314, 0xffffffffffffffffL, &x327);
   { uint64_t x330; uint8_t x331 = _subborrow_u64(x328, x317, 0x3, &x330);
   { uint64_t _; uint8_t x334 = _subborrow_u64(x331, x319, 0x0, &_);
-  { uint64_t x335 = cmovznz(x334, x330, x317);
-  { uint64_t x336 = cmovznz(x334, x327, x314);
-  { uint64_t x337 = cmovznz(x334, x324, x311);
-  { uint64_t x338 = cmovznz(x334, x321, x308);
+  { uint64_t x335 = cmovznz64(x334, x330, x317);
+  { uint64_t x336 = cmovznz64(x334, x327, x314);
+  { uint64_t x337 = cmovznz64(x334, x324, x311);
+  { uint64_t x338 = cmovznz64(x334, x321, x308);
   out[0] = x338;
   out[1] = x337;
   out[2] = x336;
diff --git a/src/Specific/montgomery64_2e194m33/femulDisplay.log b/src/Specific/montgomery64_2e194m33/femulDisplay.log
index 075bacf43..e7bf4c410 100644
--- a/src/Specific/montgomery64_2e194m33/femulDisplay.log
+++ b/src/Specific/montgomery64_2e194m33/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x327, uint8_t x328 = subborrow_u64(x325, x314, 0xffffffffffffffffL);
  uint64_t x330, uint8_t x331 = subborrow_u64(x328, x317, 0x3);
  uint64_t _, uint8_t x334 = subborrow_u64(x331, x319, 0x0);
- uint64_t x335 = cmovznz(x334, x330, x317);
- uint64_t x336 = cmovznz(x334, x327, x314);
- uint64_t x337 = cmovznz(x334, x324, x311);
- uint64_t x338 = cmovznz(x334, x321, x308);
+ uint64_t x335 = cmovznz64(x334, x330, x317);
+ uint64_t x336 = cmovznz64(x334, x327, x314);
+ uint64_t x337 = cmovznz64(x334, x324, x311);
+ uint64_t x338 = cmovznz64(x334, x321, x308);
  return (x335, x336, x337, x338))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e194m33/feopp.c b/src/Specific/montgomery64_2e194m33/feopp.c
index 7936f63b6..a12db40d3 100644
--- a/src/Specific/montgomery64_2e194m33/feopp.c
+++ b/src/Specific/montgomery64_2e194m33/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffffdfL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e194m33/feoppDisplay.log b/src/Specific/montgomery64_2e194m33/feoppDisplay.log
index 9c527c2eb..48c2b2587 100644
--- a/src/Specific/montgomery64_2e194m33/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e194m33/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffdfL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e194m33/fesub.c b/src/Specific/montgomery64_2e194m33/fesub.c
index ce527ea74..0d8b5aea0 100644
--- a/src/Specific/montgomery64_2e194m33/fesub.c
+++ b/src/Specific/montgomery64_2e194m33/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffffdfL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e194m33/fesubDisplay.log b/src/Specific/montgomery64_2e194m33/fesubDisplay.log
index 61078ee84..07812034e 100644
--- a/src/Specific/montgomery64_2e194m33/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e194m33/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffdfL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e196m15/feadd.c b/src/Specific/montgomery64_2e196m15/feadd.c
index 07a03ff20..1411b0e95 100644
--- a/src/Specific/montgomery64_2e196m15/feadd.c
+++ b/src/Specific/montgomery64_2e196m15/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0xf, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e196m15/feaddDisplay.log b/src/Specific/montgomery64_2e196m15/feaddDisplay.log
index f407a5377..35d293c7c 100644
--- a/src/Specific/montgomery64_2e196m15/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e196m15/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0xf);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e196m15/femul.c b/src/Specific/montgomery64_2e196m15/femul.c
index df786c4c7..9e6c9aeaf 100644
--- a/src/Specific/montgomery64_2e196m15/femul.c
+++ b/src/Specific/montgomery64_2e196m15/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x327; uint8_t x328 = _subborrow_u64(x325, x314, 0xffffffffffffffffL, &x327);
   { uint64_t x330; uint8_t x331 = _subborrow_u64(x328, x317, 0xf, &x330);
   { uint64_t _; uint8_t x334 = _subborrow_u64(x331, x319, 0x0, &_);
-  { uint64_t x335 = cmovznz(x334, x330, x317);
-  { uint64_t x336 = cmovznz(x334, x327, x314);
-  { uint64_t x337 = cmovznz(x334, x324, x311);
-  { uint64_t x338 = cmovznz(x334, x321, x308);
+  { uint64_t x335 = cmovznz64(x334, x330, x317);
+  { uint64_t x336 = cmovznz64(x334, x327, x314);
+  { uint64_t x337 = cmovznz64(x334, x324, x311);
+  { uint64_t x338 = cmovznz64(x334, x321, x308);
   out[0] = x338;
   out[1] = x337;
   out[2] = x336;
diff --git a/src/Specific/montgomery64_2e196m15/femulDisplay.log b/src/Specific/montgomery64_2e196m15/femulDisplay.log
index 6b2d1a05d..a2c56f3fd 100644
--- a/src/Specific/montgomery64_2e196m15/femulDisplay.log
+++ b/src/Specific/montgomery64_2e196m15/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x327, uint8_t x328 = subborrow_u64(x325, x314, 0xffffffffffffffffL);
  uint64_t x330, uint8_t x331 = subborrow_u64(x328, x317, 0xf);
  uint64_t _, uint8_t x334 = subborrow_u64(x331, x319, 0x0);
- uint64_t x335 = cmovznz(x334, x330, x317);
- uint64_t x336 = cmovznz(x334, x327, x314);
- uint64_t x337 = cmovznz(x334, x324, x311);
- uint64_t x338 = cmovznz(x334, x321, x308);
+ uint64_t x335 = cmovznz64(x334, x330, x317);
+ uint64_t x336 = cmovznz64(x334, x327, x314);
+ uint64_t x337 = cmovznz64(x334, x324, x311);
+ uint64_t x338 = cmovznz64(x334, x321, x308);
  return (x335, x336, x337, x338))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e196m15/feopp.c b/src/Specific/montgomery64_2e196m15/feopp.c
index b8d1c31ca..19622bda1 100644
--- a/src/Specific/montgomery64_2e196m15/feopp.c
+++ b/src/Specific/montgomery64_2e196m15/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffffffff1L);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e196m15/feoppDisplay.log b/src/Specific/montgomery64_2e196m15/feoppDisplay.log
index 65cad6ab3..cc51b2dd1 100644
--- a/src/Specific/montgomery64_2e196m15/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e196m15/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffffffff1L);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e196m15/fesub.c b/src/Specific/montgomery64_2e196m15/fesub.c
index c98c307bd..8ce694442 100644
--- a/src/Specific/montgomery64_2e196m15/fesub.c
+++ b/src/Specific/montgomery64_2e196m15/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xfffffffffffffff1L);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e196m15/fesubDisplay.log b/src/Specific/montgomery64_2e196m15/fesubDisplay.log
index d1aaabcd5..961fd6c8d 100644
--- a/src/Specific/montgomery64_2e196m15/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e196m15/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xfffffffffffffff1L);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e198m17/feadd.c b/src/Specific/montgomery64_2e198m17/feadd.c
index c980a1aae..462dab71d 100644
--- a/src/Specific/montgomery64_2e198m17/feadd.c
+++ b/src/Specific/montgomery64_2e198m17/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x3f, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e198m17/feaddDisplay.log b/src/Specific/montgomery64_2e198m17/feaddDisplay.log
index 6e30576b5..d4d34eddd 100644
--- a/src/Specific/montgomery64_2e198m17/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e198m17/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x3f);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e198m17/femul.c b/src/Specific/montgomery64_2e198m17/femul.c
index 9a0c04ac9..3e5aad476 100644
--- a/src/Specific/montgomery64_2e198m17/femul.c
+++ b/src/Specific/montgomery64_2e198m17/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x327; uint8_t x328 = _subborrow_u64(x325, x314, 0xffffffffffffffffL, &x327);
   { uint64_t x330; uint8_t x331 = _subborrow_u64(x328, x317, 0x3f, &x330);
   { uint64_t _; uint8_t x334 = _subborrow_u64(x331, x319, 0x0, &_);
-  { uint64_t x335 = cmovznz(x334, x330, x317);
-  { uint64_t x336 = cmovznz(x334, x327, x314);
-  { uint64_t x337 = cmovznz(x334, x324, x311);
-  { uint64_t x338 = cmovznz(x334, x321, x308);
+  { uint64_t x335 = cmovznz64(x334, x330, x317);
+  { uint64_t x336 = cmovznz64(x334, x327, x314);
+  { uint64_t x337 = cmovznz64(x334, x324, x311);
+  { uint64_t x338 = cmovznz64(x334, x321, x308);
   out[0] = x338;
   out[1] = x337;
   out[2] = x336;
diff --git a/src/Specific/montgomery64_2e198m17/femulDisplay.log b/src/Specific/montgomery64_2e198m17/femulDisplay.log
index 3092c8b9a..8823d6e80 100644
--- a/src/Specific/montgomery64_2e198m17/femulDisplay.log
+++ b/src/Specific/montgomery64_2e198m17/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x327, uint8_t x328 = subborrow_u64(x325, x314, 0xffffffffffffffffL);
  uint64_t x330, uint8_t x331 = subborrow_u64(x328, x317, 0x3f);
  uint64_t _, uint8_t x334 = subborrow_u64(x331, x319, 0x0);
- uint64_t x335 = cmovznz(x334, x330, x317);
- uint64_t x336 = cmovznz(x334, x327, x314);
- uint64_t x337 = cmovznz(x334, x324, x311);
- uint64_t x338 = cmovznz(x334, x321, x308);
+ uint64_t x335 = cmovznz64(x334, x330, x317);
+ uint64_t x336 = cmovznz64(x334, x327, x314);
+ uint64_t x337 = cmovznz64(x334, x324, x311);
+ uint64_t x338 = cmovznz64(x334, x321, x308);
  return (x335, x336, x337, x338))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e198m17/feopp.c b/src/Specific/montgomery64_2e198m17/feopp.c
index 2baa88e6a..710608892 100644
--- a/src/Specific/montgomery64_2e198m17/feopp.c
+++ b/src/Specific/montgomery64_2e198m17/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffffefL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e198m17/feoppDisplay.log b/src/Specific/montgomery64_2e198m17/feoppDisplay.log
index 93a0fec46..cb54ba741 100644
--- a/src/Specific/montgomery64_2e198m17/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e198m17/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffefL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e198m17/fesub.c b/src/Specific/montgomery64_2e198m17/fesub.c
index fb1f51dfd..eb73e957b 100644
--- a/src/Specific/montgomery64_2e198m17/fesub.c
+++ b/src/Specific/montgomery64_2e198m17/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffffefL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e198m17/fesubDisplay.log b/src/Specific/montgomery64_2e198m17/fesubDisplay.log
index f36323d00..a70ca85ad 100644
--- a/src/Specific/montgomery64_2e198m17/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e198m17/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffefL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e205m45x2e198m1/feadd.c b/src/Specific/montgomery64_2e205m45x2e198m1/feadd.c
index 6b0d0bae7..efa3e56d5 100644
--- a/src/Specific/montgomery64_2e205m45x2e198m1/feadd.c
+++ b/src/Specific/montgomery64_2e205m45x2e198m1/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x14bf, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e205m45x2e198m1/feaddDisplay.log b/src/Specific/montgomery64_2e205m45x2e198m1/feaddDisplay.log
index 3fe41e6ce..f0bef4fdc 100644
--- a/src/Specific/montgomery64_2e205m45x2e198m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e205m45x2e198m1/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x14bf);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e205m45x2e198m1/femul.c b/src/Specific/montgomery64_2e205m45x2e198m1/femul.c
index 035e6263e..48e9c8511 100644
--- a/src/Specific/montgomery64_2e205m45x2e198m1/femul.c
+++ b/src/Specific/montgomery64_2e205m45x2e198m1/femul.c
@@ -114,10 +114,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x323; uint8_t x324 = _subborrow_u64(x321, x310, 0xffffffffffffffffL, &x323);
   { uint64_t x326; uint8_t x327 = _subborrow_u64(x324, x313, 0x14bf, &x326);
   { uint64_t _; uint8_t x330 = _subborrow_u64(x327, x315, 0x0, &_);
-  { uint64_t x331 = cmovznz(x330, x326, x313);
-  { uint64_t x332 = cmovznz(x330, x323, x310);
-  { uint64_t x333 = cmovznz(x330, x320, x307);
-  { uint64_t x334 = cmovznz(x330, x317, x304);
+  { uint64_t x331 = cmovznz64(x330, x326, x313);
+  { uint64_t x332 = cmovznz64(x330, x323, x310);
+  { uint64_t x333 = cmovznz64(x330, x320, x307);
+  { uint64_t x334 = cmovznz64(x330, x317, x304);
   out[0] = x334;
   out[1] = x333;
   out[2] = x332;
diff --git a/src/Specific/montgomery64_2e205m45x2e198m1/femulDisplay.log b/src/Specific/montgomery64_2e205m45x2e198m1/femulDisplay.log
index ef0ad3031..1d65f9a33 100644
--- a/src/Specific/montgomery64_2e205m45x2e198m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e205m45x2e198m1/femulDisplay.log
@@ -109,10 +109,10 @@ Interp-η
  uint64_t x323, uint8_t x324 = subborrow_u64(x321, x310, 0xffffffffffffffffL);
  uint64_t x326, uint8_t x327 = subborrow_u64(x324, x313, 0x14bf);
  uint64_t _, uint8_t x330 = subborrow_u64(x327, x315, 0x0);
- uint64_t x331 = cmovznz(x330, x326, x313);
- uint64_t x332 = cmovznz(x330, x323, x310);
- uint64_t x333 = cmovznz(x330, x320, x307);
- uint64_t x334 = cmovznz(x330, x317, x304);
+ uint64_t x331 = cmovznz64(x330, x326, x313);
+ uint64_t x332 = cmovznz64(x330, x323, x310);
+ uint64_t x333 = cmovznz64(x330, x320, x307);
+ uint64_t x334 = cmovznz64(x330, x317, x304);
  return (x331, x332, x333, x334))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e205m45x2e198m1/feopp.c b/src/Specific/montgomery64_2e205m45x2e198m1/feopp.c
index ef25b23b0..0f3e0e288 100644
--- a/src/Specific/montgomery64_2e205m45x2e198m1/feopp.c
+++ b/src/Specific/montgomery64_2e205m45x2e198m1/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffffffL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e205m45x2e198m1/feoppDisplay.log b/src/Specific/montgomery64_2e205m45x2e198m1/feoppDisplay.log
index f1adea8a2..1d4dfdaf4 100644
--- a/src/Specific/montgomery64_2e205m45x2e198m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e205m45x2e198m1/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffffL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e205m45x2e198m1/fesub.c b/src/Specific/montgomery64_2e205m45x2e198m1/fesub.c
index 32970f5be..8a803be34 100644
--- a/src/Specific/montgomery64_2e205m45x2e198m1/fesub.c
+++ b/src/Specific/montgomery64_2e205m45x2e198m1/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffffffL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e205m45x2e198m1/fesubDisplay.log b/src/Specific/montgomery64_2e205m45x2e198m1/fesubDisplay.log
index 787160dbd..ea83e4737 100644
--- a/src/Specific/montgomery64_2e205m45x2e198m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e205m45x2e198m1/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffffL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e206m5/feadd.c b/src/Specific/montgomery64_2e206m5/feadd.c
index 9d50cdc18..bf6500712 100644
--- a/src/Specific/montgomery64_2e206m5/feadd.c
+++ b/src/Specific/montgomery64_2e206m5/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x3fff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e206m5/feaddDisplay.log b/src/Specific/montgomery64_2e206m5/feaddDisplay.log
index 9f2e78a83..b639a1e26 100644
--- a/src/Specific/montgomery64_2e206m5/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e206m5/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x3fff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e206m5/femul.c b/src/Specific/montgomery64_2e206m5/femul.c
index c0121407f..63fd232b1 100644
--- a/src/Specific/montgomery64_2e206m5/femul.c
+++ b/src/Specific/montgomery64_2e206m5/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x3fff, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e206m5/femulDisplay.log b/src/Specific/montgomery64_2e206m5/femulDisplay.log
index 1d3a153d1..597866bef 100644
--- a/src/Specific/montgomery64_2e206m5/femulDisplay.log
+++ b/src/Specific/montgomery64_2e206m5/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x3fff);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e206m5/feopp.c b/src/Specific/montgomery64_2e206m5/feopp.c
index 14d8541e4..14512cb65 100644
--- a/src/Specific/montgomery64_2e206m5/feopp.c
+++ b/src/Specific/montgomery64_2e206m5/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffffffffbL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e206m5/feoppDisplay.log b/src/Specific/montgomery64_2e206m5/feoppDisplay.log
index 9fd7c9144..66766af29 100644
--- a/src/Specific/montgomery64_2e206m5/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e206m5/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffffffffbL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e206m5/fesub.c b/src/Specific/montgomery64_2e206m5/fesub.c
index be1730986..e8a81cfcb 100644
--- a/src/Specific/montgomery64_2e206m5/fesub.c
+++ b/src/Specific/montgomery64_2e206m5/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xfffffffffffffffbL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e206m5/fesubDisplay.log b/src/Specific/montgomery64_2e206m5/fesubDisplay.log
index df75b4a64..c2474635a 100644
--- a/src/Specific/montgomery64_2e206m5/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e206m5/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xfffffffffffffffbL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e212m29/feadd.c b/src/Specific/montgomery64_2e212m29/feadd.c
index 858118997..849154657 100644
--- a/src/Specific/montgomery64_2e212m29/feadd.c
+++ b/src/Specific/montgomery64_2e212m29/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0xfffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e212m29/feaddDisplay.log b/src/Specific/montgomery64_2e212m29/feaddDisplay.log
index 490e24925..7d014a6a5 100644
--- a/src/Specific/montgomery64_2e212m29/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e212m29/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0xfffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e212m29/femul.c b/src/Specific/montgomery64_2e212m29/femul.c
index 4c1c11e33..1782985d0 100644
--- a/src/Specific/montgomery64_2e212m29/femul.c
+++ b/src/Specific/montgomery64_2e212m29/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0xfffff, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e212m29/femulDisplay.log b/src/Specific/montgomery64_2e212m29/femulDisplay.log
index 7e9de3bee..98e14dbdc 100644
--- a/src/Specific/montgomery64_2e212m29/femulDisplay.log
+++ b/src/Specific/montgomery64_2e212m29/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0xfffff);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e212m29/feopp.c b/src/Specific/montgomery64_2e212m29/feopp.c
index c379243c6..ad381e68b 100644
--- a/src/Specific/montgomery64_2e212m29/feopp.c
+++ b/src/Specific/montgomery64_2e212m29/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffffe3L);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e212m29/feoppDisplay.log b/src/Specific/montgomery64_2e212m29/feoppDisplay.log
index 6dca06ea9..3b7584aeb 100644
--- a/src/Specific/montgomery64_2e212m29/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e212m29/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffe3L);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e212m29/fesub.c b/src/Specific/montgomery64_2e212m29/fesub.c
index b606ceaac..7911800fc 100644
--- a/src/Specific/montgomery64_2e212m29/fesub.c
+++ b/src/Specific/montgomery64_2e212m29/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffffe3L);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e212m29/fesubDisplay.log b/src/Specific/montgomery64_2e212m29/fesubDisplay.log
index 3741f119d..11fdb98c0 100644
--- a/src/Specific/montgomery64_2e212m29/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e212m29/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffe3L);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e213m3/feadd.c b/src/Specific/montgomery64_2e213m3/feadd.c
index 4c4261e60..007d524ae 100644
--- a/src/Specific/montgomery64_2e213m3/feadd.c
+++ b/src/Specific/montgomery64_2e213m3/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x1fffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e213m3/feaddDisplay.log b/src/Specific/montgomery64_2e213m3/feaddDisplay.log
index 77a82cfea..a2348cfc3 100644
--- a/src/Specific/montgomery64_2e213m3/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e213m3/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x1fffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e213m3/femul.c b/src/Specific/montgomery64_2e213m3/femul.c
index 0879300f2..6e80f4806 100644
--- a/src/Specific/montgomery64_2e213m3/femul.c
+++ b/src/Specific/montgomery64_2e213m3/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x1fffff, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e213m3/femulDisplay.log b/src/Specific/montgomery64_2e213m3/femulDisplay.log
index 4d05fec0f..2205892f9 100644
--- a/src/Specific/montgomery64_2e213m3/femulDisplay.log
+++ b/src/Specific/montgomery64_2e213m3/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x1fffff);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e213m3/feopp.c b/src/Specific/montgomery64_2e213m3/feopp.c
index 729136126..9600b219b 100644
--- a/src/Specific/montgomery64_2e213m3/feopp.c
+++ b/src/Specific/montgomery64_2e213m3/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffffffffdL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e213m3/feoppDisplay.log b/src/Specific/montgomery64_2e213m3/feoppDisplay.log
index 71a607004..9d47c9866 100644
--- a/src/Specific/montgomery64_2e213m3/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e213m3/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffffffffdL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e213m3/fesub.c b/src/Specific/montgomery64_2e213m3/fesub.c
index fb27eed38..e27dc5c35 100644
--- a/src/Specific/montgomery64_2e213m3/fesub.c
+++ b/src/Specific/montgomery64_2e213m3/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xfffffffffffffffdL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e213m3/fesubDisplay.log b/src/Specific/montgomery64_2e213m3/fesubDisplay.log
index a3c52ef11..066544600 100644
--- a/src/Specific/montgomery64_2e213m3/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e213m3/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xfffffffffffffffdL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e216m2e108m1/feadd.c b/src/Specific/montgomery64_2e216m2e108m1/feadd.c
index 20d319c23..8bbafb674 100644
--- a/src/Specific/montgomery64_2e216m2e108m1/feadd.c
+++ b/src/Specific/montgomery64_2e216m2e108m1/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0xffffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e216m2e108m1/feaddDisplay.log b/src/Specific/montgomery64_2e216m2e108m1/feaddDisplay.log
index fb5257d19..7b28d893c 100644
--- a/src/Specific/montgomery64_2e216m2e108m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e216m2e108m1/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0xffffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e216m2e108m1/femul.c b/src/Specific/montgomery64_2e216m2e108m1/femul.c
index 8b4974b21..d010f3680 100644
--- a/src/Specific/montgomery64_2e216m2e108m1/femul.c
+++ b/src/Specific/montgomery64_2e216m2e108m1/femul.c
@@ -114,10 +114,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x323; uint8_t x324 = _subborrow_u64(x321, x310, 0xffffffffffffffffL, &x323);
   { uint64_t x326; uint8_t x327 = _subborrow_u64(x324, x313, 0xffffff, &x326);
   { uint64_t _; uint8_t x330 = _subborrow_u64(x327, x315, 0x0, &_);
-  { uint64_t x331 = cmovznz(x330, x326, x313);
-  { uint64_t x332 = cmovznz(x330, x323, x310);
-  { uint64_t x333 = cmovznz(x330, x320, x307);
-  { uint64_t x334 = cmovznz(x330, x317, x304);
+  { uint64_t x331 = cmovznz64(x330, x326, x313);
+  { uint64_t x332 = cmovznz64(x330, x323, x310);
+  { uint64_t x333 = cmovznz64(x330, x320, x307);
+  { uint64_t x334 = cmovznz64(x330, x317, x304);
   out[0] = x334;
   out[1] = x333;
   out[2] = x332;
diff --git a/src/Specific/montgomery64_2e216m2e108m1/femulDisplay.log b/src/Specific/montgomery64_2e216m2e108m1/femulDisplay.log
index 97e04b530..a24ee7be3 100644
--- a/src/Specific/montgomery64_2e216m2e108m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e216m2e108m1/femulDisplay.log
@@ -109,10 +109,10 @@ Interp-η
  uint64_t x323, uint8_t x324 = subborrow_u64(x321, x310, 0xffffffffffffffffL);
  uint64_t x326, uint8_t x327 = subborrow_u64(x324, x313, 0xffffff);
  uint64_t _, uint8_t x330 = subborrow_u64(x327, x315, 0x0);
- uint64_t x331 = cmovznz(x330, x326, x313);
- uint64_t x332 = cmovznz(x330, x323, x310);
- uint64_t x333 = cmovznz(x330, x320, x307);
- uint64_t x334 = cmovznz(x330, x317, x304);
+ uint64_t x331 = cmovznz64(x330, x326, x313);
+ uint64_t x332 = cmovznz64(x330, x323, x310);
+ uint64_t x333 = cmovznz64(x330, x320, x307);
+ uint64_t x334 = cmovznz64(x330, x317, x304);
  return (x331, x332, x333, x334))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e216m2e108m1/feopp.c b/src/Specific/montgomery64_2e216m2e108m1/feopp.c
index 5f1bb5030..78aa58a09 100644
--- a/src/Specific/montgomery64_2e216m2e108m1/feopp.c
+++ b/src/Specific/montgomery64_2e216m2e108m1/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffffffL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffefffffffffffL);
diff --git a/src/Specific/montgomery64_2e216m2e108m1/feoppDisplay.log b/src/Specific/montgomery64_2e216m2e108m1/feoppDisplay.log
index 4619353f7..70322fe03 100644
--- a/src/Specific/montgomery64_2e216m2e108m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e216m2e108m1/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffffL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffefffffffffffL);
diff --git a/src/Specific/montgomery64_2e216m2e108m1/fesub.c b/src/Specific/montgomery64_2e216m2e108m1/fesub.c
index c9d9565dc..74132016f 100644
--- a/src/Specific/montgomery64_2e216m2e108m1/fesub.c
+++ b/src/Specific/montgomery64_2e216m2e108m1/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffffffL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffefffffffffffL);
diff --git a/src/Specific/montgomery64_2e216m2e108m1/fesubDisplay.log b/src/Specific/montgomery64_2e216m2e108m1/fesubDisplay.log
index 15fa29c17..7d9995253 100644
--- a/src/Specific/montgomery64_2e216m2e108m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e216m2e108m1/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffffL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffefffffffffffL);
diff --git a/src/Specific/montgomery64_2e221m3/feadd.c b/src/Specific/montgomery64_2e221m3/feadd.c
index 4be18d8bc..24f858061 100644
--- a/src/Specific/montgomery64_2e221m3/feadd.c
+++ b/src/Specific/montgomery64_2e221m3/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x1fffffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e221m3/feaddDisplay.log b/src/Specific/montgomery64_2e221m3/feaddDisplay.log
index b67142885..212988003 100644
--- a/src/Specific/montgomery64_2e221m3/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e221m3/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x1fffffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e221m3/femul.c b/src/Specific/montgomery64_2e221m3/femul.c
index 2e1413c75..9ef17c44b 100644
--- a/src/Specific/montgomery64_2e221m3/femul.c
+++ b/src/Specific/montgomery64_2e221m3/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x1fffffff, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e221m3/femulDisplay.log b/src/Specific/montgomery64_2e221m3/femulDisplay.log
index 69bc6a8dd..b50291902 100644
--- a/src/Specific/montgomery64_2e221m3/femulDisplay.log
+++ b/src/Specific/montgomery64_2e221m3/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x1fffffff);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e221m3/feopp.c b/src/Specific/montgomery64_2e221m3/feopp.c
index 0c0255d93..1f92ce83d 100644
--- a/src/Specific/montgomery64_2e221m3/feopp.c
+++ b/src/Specific/montgomery64_2e221m3/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffffffffdL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e221m3/feoppDisplay.log b/src/Specific/montgomery64_2e221m3/feoppDisplay.log
index 4b83cb226..f298014bc 100644
--- a/src/Specific/montgomery64_2e221m3/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e221m3/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffffffffdL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e221m3/fesub.c b/src/Specific/montgomery64_2e221m3/fesub.c
index f0106fd81..7db2e8c61 100644
--- a/src/Specific/montgomery64_2e221m3/fesub.c
+++ b/src/Specific/montgomery64_2e221m3/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xfffffffffffffffdL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e221m3/fesubDisplay.log b/src/Specific/montgomery64_2e221m3/fesubDisplay.log
index c4d187150..3c9cbaee3 100644
--- a/src/Specific/montgomery64_2e221m3/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e221m3/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xfffffffffffffffdL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e222m117/feadd.c b/src/Specific/montgomery64_2e222m117/feadd.c
index e1cc8be53..f91088926 100644
--- a/src/Specific/montgomery64_2e222m117/feadd.c
+++ b/src/Specific/montgomery64_2e222m117/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x3fffffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e222m117/feaddDisplay.log b/src/Specific/montgomery64_2e222m117/feaddDisplay.log
index be178ed97..855ae784b 100644
--- a/src/Specific/montgomery64_2e222m117/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e222m117/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x3fffffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e222m117/femul.c b/src/Specific/montgomery64_2e222m117/femul.c
index 91ca1c408..899159869 100644
--- a/src/Specific/montgomery64_2e222m117/femul.c
+++ b/src/Specific/montgomery64_2e222m117/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x3fffffff, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e222m117/femulDisplay.log b/src/Specific/montgomery64_2e222m117/femulDisplay.log
index 162eb1d99..2031fec31 100644
--- a/src/Specific/montgomery64_2e222m117/femulDisplay.log
+++ b/src/Specific/montgomery64_2e222m117/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x3fffffff);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e222m117/feopp.c b/src/Specific/montgomery64_2e222m117/feopp.c
index 28602d0a9..447eee8ab 100644
--- a/src/Specific/montgomery64_2e222m117/feopp.c
+++ b/src/Specific/montgomery64_2e222m117/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffff8bL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e222m117/feoppDisplay.log b/src/Specific/montgomery64_2e222m117/feoppDisplay.log
index 0004f48ad..c4aa04fad 100644
--- a/src/Specific/montgomery64_2e222m117/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e222m117/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffff8bL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e222m117/fesub.c b/src/Specific/montgomery64_2e222m117/fesub.c
index 8f43c55a0..b138dafbd 100644
--- a/src/Specific/montgomery64_2e222m117/fesub.c
+++ b/src/Specific/montgomery64_2e222m117/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffff8bL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e222m117/fesubDisplay.log b/src/Specific/montgomery64_2e222m117/fesubDisplay.log
index 321752ed2..13abe8776 100644
--- a/src/Specific/montgomery64_2e222m117/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e222m117/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffff8bL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e224m2e96p1/feadd.c b/src/Specific/montgomery64_2e224m2e96p1/feadd.c
index cbe89cc4b..1cb91cd34 100644
--- a/src/Specific/montgomery64_2e224m2e96p1/feadd.c
+++ b/src/Specific/montgomery64_2e224m2e96p1/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0xffffffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e224m2e96p1/feaddDisplay.log b/src/Specific/montgomery64_2e224m2e96p1/feaddDisplay.log
index 674908c3e..c653739ee 100644
--- a/src/Specific/montgomery64_2e224m2e96p1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e224m2e96p1/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0xffffffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e224m2e96p1/femul.c b/src/Specific/montgomery64_2e224m2e96p1/femul.c
index 16bd42b73..eacac67f9 100644
--- a/src/Specific/montgomery64_2e224m2e96p1/femul.c
+++ b/src/Specific/montgomery64_2e224m2e96p1/femul.c
@@ -110,10 +110,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x311; uint8_t x312 = _subborrow_u64(x309, x298, 0xffffffffffffffffL, &x311);
   { uint64_t x314; uint8_t x315 = _subborrow_u64(x312, x301, 0xffffffff, &x314);
   { uint64_t _; uint8_t x318 = _subborrow_u64(x315, x303, 0x0, &_);
-  { uint64_t x319 = cmovznz(x318, x314, x301);
-  { uint64_t x320 = cmovznz(x318, x311, x298);
-  { uint64_t x321 = cmovznz(x318, x308, x295);
-  { uint64_t x322 = cmovznz(x318, x305, x292);
+  { uint64_t x319 = cmovznz64(x318, x314, x301);
+  { uint64_t x320 = cmovznz64(x318, x311, x298);
+  { uint64_t x321 = cmovznz64(x318, x308, x295);
+  { uint64_t x322 = cmovznz64(x318, x305, x292);
   out[0] = x322;
   out[1] = x321;
   out[2] = x320;
diff --git a/src/Specific/montgomery64_2e224m2e96p1/femulDisplay.log b/src/Specific/montgomery64_2e224m2e96p1/femulDisplay.log
index e90c84b41..7482561e4 100644
--- a/src/Specific/montgomery64_2e224m2e96p1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e224m2e96p1/femulDisplay.log
@@ -105,10 +105,10 @@ Interp-η
  uint64_t x311, uint8_t x312 = subborrow_u64(x309, x298, 0xffffffffffffffffL);
  uint64_t x314, uint8_t x315 = subborrow_u64(x312, x301, 0xffffffff);
  uint64_t _, uint8_t x318 = subborrow_u64(x315, x303, 0x0);
- uint64_t x319 = cmovznz(x318, x314, x301);
- uint64_t x320 = cmovznz(x318, x311, x298);
- uint64_t x321 = cmovznz(x318, x308, x295);
- uint64_t x322 = cmovznz(x318, x305, x292);
+ uint64_t x319 = cmovznz64(x318, x314, x301);
+ uint64_t x320 = cmovznz64(x318, x311, x298);
+ uint64_t x321 = cmovznz64(x318, x308, x295);
+ uint64_t x322 = cmovznz64(x318, x305, x292);
  return (x319, x320, x321, x322))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e224m2e96p1/feopp.c b/src/Specific/montgomery64_2e224m2e96p1/feopp.c
index 79c6bb9a1..6bb56a416 100644
--- a/src/Specific/montgomery64_2e224m2e96p1/feopp.c
+++ b/src/Specific/montgomery64_2e224m2e96p1/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint8_t x20 = ((uint8_t)x19 & 0x1);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffff00000000L);
diff --git a/src/Specific/montgomery64_2e224m2e96p1/feoppDisplay.log b/src/Specific/montgomery64_2e224m2e96p1/feoppDisplay.log
index 3052a69ad..2885df362 100644
--- a/src/Specific/montgomery64_2e224m2e96p1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e224m2e96p1/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint8_t x20 = ((uint8_t)x19 & 0x1);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffff00000000L);
diff --git a/src/Specific/montgomery64_2e224m2e96p1/fesub.c b/src/Specific/montgomery64_2e224m2e96p1/fesub.c
index 30e07cb2f..91a2004fc 100644
--- a/src/Specific/montgomery64_2e224m2e96p1/fesub.c
+++ b/src/Specific/montgomery64_2e224m2e96p1/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint8_t x29 = ((uint8_t)x28 & 0x1);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffff00000000L);
diff --git a/src/Specific/montgomery64_2e224m2e96p1/fesubDisplay.log b/src/Specific/montgomery64_2e224m2e96p1/fesubDisplay.log
index 7abd112ae..73f4b09ed 100644
--- a/src/Specific/montgomery64_2e224m2e96p1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e224m2e96p1/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint8_t x29 = ((uint8_t)x28 & 0x1);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffff00000000L);
diff --git a/src/Specific/montgomery64_2e226m5/feadd.c b/src/Specific/montgomery64_2e226m5/feadd.c
index 0f9ca95c8..4334bc35d 100644
--- a/src/Specific/montgomery64_2e226m5/feadd.c
+++ b/src/Specific/montgomery64_2e226m5/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x3ffffffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e226m5/feaddDisplay.log b/src/Specific/montgomery64_2e226m5/feaddDisplay.log
index f8e6207d8..1c5eb603b 100644
--- a/src/Specific/montgomery64_2e226m5/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e226m5/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x3ffffffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e226m5/femul.c b/src/Specific/montgomery64_2e226m5/femul.c
index c5c47b343..e894281fb 100644
--- a/src/Specific/montgomery64_2e226m5/femul.c
+++ b/src/Specific/montgomery64_2e226m5/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x3ffffffff, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e226m5/femulDisplay.log b/src/Specific/montgomery64_2e226m5/femulDisplay.log
index c1e5615f7..646644444 100644
--- a/src/Specific/montgomery64_2e226m5/femulDisplay.log
+++ b/src/Specific/montgomery64_2e226m5/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x3ffffffff);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e226m5/feopp.c b/src/Specific/montgomery64_2e226m5/feopp.c
index 3ad87f131..6f2c1f751 100644
--- a/src/Specific/montgomery64_2e226m5/feopp.c
+++ b/src/Specific/montgomery64_2e226m5/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffffffffbL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e226m5/feoppDisplay.log b/src/Specific/montgomery64_2e226m5/feoppDisplay.log
index f347ffdd1..dc4cd833a 100644
--- a/src/Specific/montgomery64_2e226m5/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e226m5/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffffffffbL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e226m5/fesub.c b/src/Specific/montgomery64_2e226m5/fesub.c
index e78610512..0bd48dc55 100644
--- a/src/Specific/montgomery64_2e226m5/fesub.c
+++ b/src/Specific/montgomery64_2e226m5/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xfffffffffffffffbL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e226m5/fesubDisplay.log b/src/Specific/montgomery64_2e226m5/fesubDisplay.log
index 766ea1367..cf4c950b3 100644
--- a/src/Specific/montgomery64_2e226m5/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e226m5/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xfffffffffffffffbL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e230m27/feadd.c b/src/Specific/montgomery64_2e230m27/feadd.c
index fea2534c3..0027b2e0e 100644
--- a/src/Specific/montgomery64_2e230m27/feadd.c
+++ b/src/Specific/montgomery64_2e230m27/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x3fffffffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e230m27/feaddDisplay.log b/src/Specific/montgomery64_2e230m27/feaddDisplay.log
index 3ac9efd9e..e6e4b6cfe 100644
--- a/src/Specific/montgomery64_2e230m27/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e230m27/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x3fffffffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e230m27/femul.c b/src/Specific/montgomery64_2e230m27/femul.c
index 387681d81..11104a07f 100644
--- a/src/Specific/montgomery64_2e230m27/femul.c
+++ b/src/Specific/montgomery64_2e230m27/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x3fffffffff, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e230m27/femulDisplay.log b/src/Specific/montgomery64_2e230m27/femulDisplay.log
index 279a64c87..4f8e62a26 100644
--- a/src/Specific/montgomery64_2e230m27/femulDisplay.log
+++ b/src/Specific/montgomery64_2e230m27/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x3fffffffff);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e230m27/feopp.c b/src/Specific/montgomery64_2e230m27/feopp.c
index 721a54ccc..a94c07462 100644
--- a/src/Specific/montgomery64_2e230m27/feopp.c
+++ b/src/Specific/montgomery64_2e230m27/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffffe5L);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e230m27/feoppDisplay.log b/src/Specific/montgomery64_2e230m27/feoppDisplay.log
index fe37819cf..467219dc4 100644
--- a/src/Specific/montgomery64_2e230m27/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e230m27/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffe5L);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e230m27/fesub.c b/src/Specific/montgomery64_2e230m27/fesub.c
index 4c915b813..0227c54e6 100644
--- a/src/Specific/montgomery64_2e230m27/fesub.c
+++ b/src/Specific/montgomery64_2e230m27/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffffe5L);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e230m27/fesubDisplay.log b/src/Specific/montgomery64_2e230m27/fesubDisplay.log
index bdee14738..08985aaf7 100644
--- a/src/Specific/montgomery64_2e230m27/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e230m27/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffe5L);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e235m15/feadd.c b/src/Specific/montgomery64_2e235m15/feadd.c
index 1d7e9c091..6537ac9bf 100644
--- a/src/Specific/montgomery64_2e235m15/feadd.c
+++ b/src/Specific/montgomery64_2e235m15/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x7ffffffffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e235m15/feaddDisplay.log b/src/Specific/montgomery64_2e235m15/feaddDisplay.log
index adf7d5340..9827efd67 100644
--- a/src/Specific/montgomery64_2e235m15/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e235m15/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x7ffffffffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e235m15/femul.c b/src/Specific/montgomery64_2e235m15/femul.c
index 270793a9c..3f0c87231 100644
--- a/src/Specific/montgomery64_2e235m15/femul.c
+++ b/src/Specific/montgomery64_2e235m15/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x7ffffffffff, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e235m15/femulDisplay.log b/src/Specific/montgomery64_2e235m15/femulDisplay.log
index ffb277bcc..2b9931cf7 100644
--- a/src/Specific/montgomery64_2e235m15/femulDisplay.log
+++ b/src/Specific/montgomery64_2e235m15/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x7ffffffffff);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e235m15/feopp.c b/src/Specific/montgomery64_2e235m15/feopp.c
index 96fd89b75..8030e3746 100644
--- a/src/Specific/montgomery64_2e235m15/feopp.c
+++ b/src/Specific/montgomery64_2e235m15/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffffffff1L);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e235m15/feoppDisplay.log b/src/Specific/montgomery64_2e235m15/feoppDisplay.log
index 7e997bcd8..94ec9e81b 100644
--- a/src/Specific/montgomery64_2e235m15/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e235m15/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffffffff1L);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e235m15/fesub.c b/src/Specific/montgomery64_2e235m15/fesub.c
index 86d67d863..88f0cc105 100644
--- a/src/Specific/montgomery64_2e235m15/fesub.c
+++ b/src/Specific/montgomery64_2e235m15/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xfffffffffffffff1L);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e235m15/fesubDisplay.log b/src/Specific/montgomery64_2e235m15/fesubDisplay.log
index 075f80786..1faf8a6e8 100644
--- a/src/Specific/montgomery64_2e235m15/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e235m15/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xfffffffffffffff1L);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e243m9/feadd.c b/src/Specific/montgomery64_2e243m9/feadd.c
index 24c69e18c..01f0c4674 100644
--- a/src/Specific/montgomery64_2e243m9/feadd.c
+++ b/src/Specific/montgomery64_2e243m9/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x7ffffffffffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e243m9/feaddDisplay.log b/src/Specific/montgomery64_2e243m9/feaddDisplay.log
index 867884527..9871bcfa8 100644
--- a/src/Specific/montgomery64_2e243m9/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e243m9/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x7ffffffffffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e243m9/femul.c b/src/Specific/montgomery64_2e243m9/femul.c
index b9fd4460b..b515b9f12 100644
--- a/src/Specific/montgomery64_2e243m9/femul.c
+++ b/src/Specific/montgomery64_2e243m9/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x7ffffffffffff, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e243m9/femulDisplay.log b/src/Specific/montgomery64_2e243m9/femulDisplay.log
index e0ded37e6..6b961a6ce 100644
--- a/src/Specific/montgomery64_2e243m9/femulDisplay.log
+++ b/src/Specific/montgomery64_2e243m9/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x7ffffffffffff);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e243m9/feopp.c b/src/Specific/montgomery64_2e243m9/feopp.c
index 0a9f8ea30..956373177 100644
--- a/src/Specific/montgomery64_2e243m9/feopp.c
+++ b/src/Specific/montgomery64_2e243m9/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffffffff7L);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e243m9/feoppDisplay.log b/src/Specific/montgomery64_2e243m9/feoppDisplay.log
index 12a4c7c38..f40ba16b9 100644
--- a/src/Specific/montgomery64_2e243m9/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e243m9/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffffffff7L);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e243m9/fesub.c b/src/Specific/montgomery64_2e243m9/fesub.c
index 43a5b19bd..93debaaa9 100644
--- a/src/Specific/montgomery64_2e243m9/fesub.c
+++ b/src/Specific/montgomery64_2e243m9/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xfffffffffffffff7L);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e243m9/fesubDisplay.log b/src/Specific/montgomery64_2e243m9/fesubDisplay.log
index 76d50e69e..c730ca129 100644
--- a/src/Specific/montgomery64_2e243m9/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e243m9/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xfffffffffffffff7L);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e251m9/feadd.c b/src/Specific/montgomery64_2e251m9/feadd.c
index 97273bf73..42b9ea878 100644
--- a/src/Specific/montgomery64_2e251m9/feadd.c
+++ b/src/Specific/montgomery64_2e251m9/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x7ffffffffffffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e251m9/feaddDisplay.log b/src/Specific/montgomery64_2e251m9/feaddDisplay.log
index 6f7d94ac7..a4fd422d6 100644
--- a/src/Specific/montgomery64_2e251m9/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e251m9/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x7ffffffffffffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e251m9/femul.c b/src/Specific/montgomery64_2e251m9/femul.c
index 2baaf615f..c10aea27b 100644
--- a/src/Specific/montgomery64_2e251m9/femul.c
+++ b/src/Specific/montgomery64_2e251m9/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x7ffffffffffffff, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e251m9/femulDisplay.log b/src/Specific/montgomery64_2e251m9/femulDisplay.log
index 91d84a220..0f9304f68 100644
--- a/src/Specific/montgomery64_2e251m9/femulDisplay.log
+++ b/src/Specific/montgomery64_2e251m9/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x7ffffffffffffff);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e251m9/feopp.c b/src/Specific/montgomery64_2e251m9/feopp.c
index 17e6da548..e37c6d0d9 100644
--- a/src/Specific/montgomery64_2e251m9/feopp.c
+++ b/src/Specific/montgomery64_2e251m9/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffffffff7L);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e251m9/feoppDisplay.log b/src/Specific/montgomery64_2e251m9/feoppDisplay.log
index ab2a7ccb2..237800aa3 100644
--- a/src/Specific/montgomery64_2e251m9/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e251m9/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffffffff7L);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e251m9/fesub.c b/src/Specific/montgomery64_2e251m9/fesub.c
index ae30748ea..8391d0892 100644
--- a/src/Specific/montgomery64_2e251m9/fesub.c
+++ b/src/Specific/montgomery64_2e251m9/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xfffffffffffffff7L);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e251m9/fesubDisplay.log b/src/Specific/montgomery64_2e251m9/fesubDisplay.log
index 6f9496219..d98803e52 100644
--- a/src/Specific/montgomery64_2e251m9/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e251m9/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xfffffffffffffff7L);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e254m127x2e240m1/feadd.c b/src/Specific/montgomery64_2e254m127x2e240m1/feadd.c
index 0abe6fc52..6921369c7 100644
--- a/src/Specific/montgomery64_2e254m127x2e240m1/feadd.c
+++ b/src/Specific/montgomery64_2e254m127x2e240m1/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x3f80ffffffffffff, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e254m127x2e240m1/feaddDisplay.log b/src/Specific/montgomery64_2e254m127x2e240m1/feaddDisplay.log
index b73338d86..acf9736ba 100644
--- a/src/Specific/montgomery64_2e254m127x2e240m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e254m127x2e240m1/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x3f80ffffffffffff);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e254m127x2e240m1/femul.c b/src/Specific/montgomery64_2e254m127x2e240m1/femul.c
index 1ba62c3d5..69062aa1d 100644
--- a/src/Specific/montgomery64_2e254m127x2e240m1/femul.c
+++ b/src/Specific/montgomery64_2e254m127x2e240m1/femul.c
@@ -114,10 +114,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x323; uint8_t x324 = _subborrow_u64(x321, x310, 0xffffffffffffffffL, &x323);
   { uint64_t x326; uint8_t x327 = _subborrow_u64(x324, x313, 0x3f80ffffffffffff, &x326);
   { uint64_t _; uint8_t x330 = _subborrow_u64(x327, x315, 0x0, &_);
-  { uint64_t x331 = cmovznz(x330, x326, x313);
-  { uint64_t x332 = cmovznz(x330, x323, x310);
-  { uint64_t x333 = cmovznz(x330, x320, x307);
-  { uint64_t x334 = cmovznz(x330, x317, x304);
+  { uint64_t x331 = cmovznz64(x330, x326, x313);
+  { uint64_t x332 = cmovznz64(x330, x323, x310);
+  { uint64_t x333 = cmovznz64(x330, x320, x307);
+  { uint64_t x334 = cmovznz64(x330, x317, x304);
   out[0] = x334;
   out[1] = x333;
   out[2] = x332;
diff --git a/src/Specific/montgomery64_2e254m127x2e240m1/femulDisplay.log b/src/Specific/montgomery64_2e254m127x2e240m1/femulDisplay.log
index b7729e430..730bbce58 100644
--- a/src/Specific/montgomery64_2e254m127x2e240m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e254m127x2e240m1/femulDisplay.log
@@ -109,10 +109,10 @@ Interp-η
  uint64_t x323, uint8_t x324 = subborrow_u64(x321, x310, 0xffffffffffffffffL);
  uint64_t x326, uint8_t x327 = subborrow_u64(x324, x313, 0x3f80ffffffffffff);
  uint64_t _, uint8_t x330 = subborrow_u64(x327, x315, 0x0);
- uint64_t x331 = cmovznz(x330, x326, x313);
- uint64_t x332 = cmovznz(x330, x323, x310);
- uint64_t x333 = cmovznz(x330, x320, x307);
- uint64_t x334 = cmovznz(x330, x317, x304);
+ uint64_t x331 = cmovznz64(x330, x326, x313);
+ uint64_t x332 = cmovznz64(x330, x323, x310);
+ uint64_t x333 = cmovznz64(x330, x320, x307);
+ uint64_t x334 = cmovznz64(x330, x317, x304);
  return (x331, x332, x333, x334))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e254m127x2e240m1/feopp.c b/src/Specific/montgomery64_2e254m127x2e240m1/feopp.c
index 7ec5b940b..862551d03 100644
--- a/src/Specific/montgomery64_2e254m127x2e240m1/feopp.c
+++ b/src/Specific/montgomery64_2e254m127x2e240m1/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffffffL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e254m127x2e240m1/feoppDisplay.log b/src/Specific/montgomery64_2e254m127x2e240m1/feoppDisplay.log
index 2d46f5a9b..dc4848371 100644
--- a/src/Specific/montgomery64_2e254m127x2e240m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e254m127x2e240m1/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffffL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e254m127x2e240m1/fesub.c b/src/Specific/montgomery64_2e254m127x2e240m1/fesub.c
index f36de2fd6..82b995af4 100644
--- a/src/Specific/montgomery64_2e254m127x2e240m1/fesub.c
+++ b/src/Specific/montgomery64_2e254m127x2e240m1/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffffffL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e254m127x2e240m1/fesubDisplay.log b/src/Specific/montgomery64_2e254m127x2e240m1/fesubDisplay.log
index 4ce5c73bb..a9f5ecefa 100644
--- a/src/Specific/montgomery64_2e254m127x2e240m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e254m127x2e240m1/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffffL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m19/feadd.c b/src/Specific/montgomery64_2e255m19/feadd.c
index 32341f1d4..caf4ae59e 100644
--- a/src/Specific/montgomery64_2e255m19/feadd.c
+++ b/src/Specific/montgomery64_2e255m19/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x7fffffffffffffffL, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e255m19/feaddDisplay.log b/src/Specific/montgomery64_2e255m19/feaddDisplay.log
index 201b3df26..0afad5f44 100644
--- a/src/Specific/montgomery64_2e255m19/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e255m19/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e255m19/femul.c b/src/Specific/montgomery64_2e255m19/femul.c
index fa07ad60a..27976f9d3 100644
--- a/src/Specific/montgomery64_2e255m19/femul.c
+++ b/src/Specific/montgomery64_2e255m19/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x7fffffffffffffffL, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e255m19/femulDisplay.log b/src/Specific/montgomery64_2e255m19/femulDisplay.log
index 78e8bf9ad..0a8c04e28 100644
--- a/src/Specific/montgomery64_2e255m19/femulDisplay.log
+++ b/src/Specific/montgomery64_2e255m19/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e255m19/feopp.c b/src/Specific/montgomery64_2e255m19/feopp.c
index 63a6cccaa..f7bc56926 100644
--- a/src/Specific/montgomery64_2e255m19/feopp.c
+++ b/src/Specific/montgomery64_2e255m19/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffffedL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m19/feoppDisplay.log b/src/Specific/montgomery64_2e255m19/feoppDisplay.log
index 5df987b6a..ef7f18fdb 100644
--- a/src/Specific/montgomery64_2e255m19/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e255m19/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffedL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m19/fesub.c b/src/Specific/montgomery64_2e255m19/fesub.c
index 3d5efe708..8e4400464 100644
--- a/src/Specific/montgomery64_2e255m19/fesub.c
+++ b/src/Specific/montgomery64_2e255m19/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffffedL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m19/fesubDisplay.log b/src/Specific/montgomery64_2e255m19/fesubDisplay.log
index 8f079a97e..68b1ede8b 100644
--- a/src/Specific/montgomery64_2e255m19/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e255m19/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffedL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m2e4m2e1m1/feadd.c b/src/Specific/montgomery64_2e255m2e4m2e1m1/feadd.c
index 32341f1d4..caf4ae59e 100644
--- a/src/Specific/montgomery64_2e255m2e4m2e1m1/feadd.c
+++ b/src/Specific/montgomery64_2e255m2e4m2e1m1/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x7fffffffffffffffL, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e255m2e4m2e1m1/feaddDisplay.log b/src/Specific/montgomery64_2e255m2e4m2e1m1/feaddDisplay.log
index 201b3df26..0afad5f44 100644
--- a/src/Specific/montgomery64_2e255m2e4m2e1m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e255m2e4m2e1m1/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e255m2e4m2e1m1/femul.c b/src/Specific/montgomery64_2e255m2e4m2e1m1/femul.c
index fa07ad60a..27976f9d3 100644
--- a/src/Specific/montgomery64_2e255m2e4m2e1m1/femul.c
+++ b/src/Specific/montgomery64_2e255m2e4m2e1m1/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x7fffffffffffffffL, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e255m2e4m2e1m1/femulDisplay.log b/src/Specific/montgomery64_2e255m2e4m2e1m1/femulDisplay.log
index 78e8bf9ad..0a8c04e28 100644
--- a/src/Specific/montgomery64_2e255m2e4m2e1m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e255m2e4m2e1m1/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e255m2e4m2e1m1/feopp.c b/src/Specific/montgomery64_2e255m2e4m2e1m1/feopp.c
index 63a6cccaa..f7bc56926 100644
--- a/src/Specific/montgomery64_2e255m2e4m2e1m1/feopp.c
+++ b/src/Specific/montgomery64_2e255m2e4m2e1m1/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffffedL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m2e4m2e1m1/feoppDisplay.log b/src/Specific/montgomery64_2e255m2e4m2e1m1/feoppDisplay.log
index 5df987b6a..ef7f18fdb 100644
--- a/src/Specific/montgomery64_2e255m2e4m2e1m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e255m2e4m2e1m1/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffedL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m2e4m2e1m1/fesub.c b/src/Specific/montgomery64_2e255m2e4m2e1m1/fesub.c
index 3d5efe708..8e4400464 100644
--- a/src/Specific/montgomery64_2e255m2e4m2e1m1/fesub.c
+++ b/src/Specific/montgomery64_2e255m2e4m2e1m1/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffffedL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m2e4m2e1m1/fesubDisplay.log b/src/Specific/montgomery64_2e255m2e4m2e1m1/fesubDisplay.log
index 8f079a97e..68b1ede8b 100644
--- a/src/Specific/montgomery64_2e255m2e4m2e1m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e255m2e4m2e1m1/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffedL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m765/feadd.c b/src/Specific/montgomery64_2e255m765/feadd.c
index 0d958f563..44d3c7827 100644
--- a/src/Specific/montgomery64_2e255m765/feadd.c
+++ b/src/Specific/montgomery64_2e255m765/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0x7fffffffffffffffL, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e255m765/feaddDisplay.log b/src/Specific/montgomery64_2e255m765/feaddDisplay.log
index 81cbd084a..fe4bb1921 100644
--- a/src/Specific/montgomery64_2e255m765/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e255m765/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e255m765/femul.c b/src/Specific/montgomery64_2e255m765/femul.c
index 086ee490e..b2c04e1ce 100644
--- a/src/Specific/montgomery64_2e255m765/femul.c
+++ b/src/Specific/montgomery64_2e255m765/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0x7fffffffffffffffL, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e255m765/femulDisplay.log b/src/Specific/montgomery64_2e255m765/femulDisplay.log
index fd289a40b..88a22cde6 100644
--- a/src/Specific/montgomery64_2e255m765/femulDisplay.log
+++ b/src/Specific/montgomery64_2e255m765/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e255m765/feopp.c b/src/Specific/montgomery64_2e255m765/feopp.c
index 8b2b30fb9..3842bfcc0 100644
--- a/src/Specific/montgomery64_2e255m765/feopp.c
+++ b/src/Specific/montgomery64_2e255m765/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffffffd03L);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m765/feoppDisplay.log b/src/Specific/montgomery64_2e255m765/feoppDisplay.log
index 15c377368..bc3a61489 100644
--- a/src/Specific/montgomery64_2e255m765/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e255m765/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffffffd03L);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m765/fesub.c b/src/Specific/montgomery64_2e255m765/fesub.c
index 431b34e89..61706f866 100644
--- a/src/Specific/montgomery64_2e255m765/fesub.c
+++ b/src/Specific/montgomery64_2e255m765/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xfffffffffffffd03L);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e255m765/fesubDisplay.log b/src/Specific/montgomery64_2e255m765/fesubDisplay.log
index 15cf096d4..f31b891f6 100644
--- a/src/Specific/montgomery64_2e255m765/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e255m765/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xfffffffffffffd03L);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m189/feadd.c b/src/Specific/montgomery64_2e256m189/feadd.c
index e1568049f..1f8f68ebe 100644
--- a/src/Specific/montgomery64_2e256m189/feadd.c
+++ b/src/Specific/montgomery64_2e256m189/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0xffffffffffffffffL, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e256m189/feaddDisplay.log b/src/Specific/montgomery64_2e256m189/feaddDisplay.log
index 079b977ea..5b28c3467 100644
--- a/src/Specific/montgomery64_2e256m189/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e256m189/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0xffffffffffffffffL);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e256m189/femul.c b/src/Specific/montgomery64_2e256m189/femul.c
index 3744abce3..7acb54447 100644
--- a/src/Specific/montgomery64_2e256m189/femul.c
+++ b/src/Specific/montgomery64_2e256m189/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0xffffffffffffffffL, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e256m189/femulDisplay.log b/src/Specific/montgomery64_2e256m189/femulDisplay.log
index e85adb572..e9d9a9334 100644
--- a/src/Specific/montgomery64_2e256m189/femulDisplay.log
+++ b/src/Specific/montgomery64_2e256m189/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0xffffffffffffffffL);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e256m189/feopp.c b/src/Specific/montgomery64_2e256m189/feopp.c
index fc90bc87d..e6fb61c33 100644
--- a/src/Specific/montgomery64_2e256m189/feopp.c
+++ b/src/Specific/montgomery64_2e256m189/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffff43L);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m189/feoppDisplay.log b/src/Specific/montgomery64_2e256m189/feoppDisplay.log
index 682e7e91b..9eabbbfcf 100644
--- a/src/Specific/montgomery64_2e256m189/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e256m189/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffff43L);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m189/fesub.c b/src/Specific/montgomery64_2e256m189/fesub.c
index 4ba6a7b5a..235e733b4 100644
--- a/src/Specific/montgomery64_2e256m189/fesub.c
+++ b/src/Specific/montgomery64_2e256m189/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffff43L);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m189/fesubDisplay.log b/src/Specific/montgomery64_2e256m189/fesubDisplay.log
index 019b4c966..a7aa158b4 100644
--- a/src/Specific/montgomery64_2e256m189/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e256m189/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffff43L);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feadd.c b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feadd.c
index 12306c312..9b4c39955 100644
--- a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feadd.c
+++ b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0x0, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0xffffffff00000001L, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feaddDisplay.log b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feaddDisplay.log
index ba7a2f50d..9849e94ae 100644
--- a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0x0);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0xffffffff00000001L);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/femul.c b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/femul.c
index acea3b182..71c0a2e99 100644
--- a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/femul.c
+++ b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/femul.c
@@ -110,10 +110,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x311; uint8_t x312 = _subborrow_u64(x309, x298, 0x0, &x311);
   { uint64_t x314; uint8_t x315 = _subborrow_u64(x312, x301, 0xffffffff00000001L, &x314);
   { uint64_t _; uint8_t x318 = _subborrow_u64(x315, x303, 0x0, &_);
-  { uint64_t x319 = cmovznz(x318, x314, x301);
-  { uint64_t x320 = cmovznz(x318, x311, x298);
-  { uint64_t x321 = cmovznz(x318, x308, x295);
-  { uint64_t x322 = cmovznz(x318, x305, x292);
+  { uint64_t x319 = cmovznz64(x318, x314, x301);
+  { uint64_t x320 = cmovznz64(x318, x311, x298);
+  { uint64_t x321 = cmovznz64(x318, x308, x295);
+  { uint64_t x322 = cmovznz64(x318, x305, x292);
   out[0] = x322;
   out[1] = x321;
   out[2] = x320;
diff --git a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/femulDisplay.log b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/femulDisplay.log
index 78afa86fa..1ad198fe0 100644
--- a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/femulDisplay.log
@@ -105,10 +105,10 @@ Interp-η
  uint64_t x311, uint8_t x312 = subborrow_u64(x309, x298, 0x0);
  uint64_t x314, uint8_t x315 = subborrow_u64(x312, x301, 0xffffffff00000001L);
  uint64_t _, uint8_t x318 = subborrow_u64(x315, x303, 0x0);
- uint64_t x319 = cmovznz(x318, x314, x301);
- uint64_t x320 = cmovznz(x318, x311, x298);
- uint64_t x321 = cmovznz(x318, x308, x295);
- uint64_t x322 = cmovznz(x318, x305, x292);
+ uint64_t x319 = cmovznz64(x318, x314, x301);
+ uint64_t x320 = cmovznz64(x318, x311, x298);
+ uint64_t x321 = cmovznz64(x318, x308, x295);
+ uint64_t x322 = cmovznz64(x318, x305, x292);
  return (x319, x320, x321, x322))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feopp.c b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feopp.c
index 6a7ade989..680f0ec5b 100644
--- a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feopp.c
+++ b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffffffL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffff);
diff --git a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feoppDisplay.log b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feoppDisplay.log
index 87297dfac..b08bcd7fb 100644
--- a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffffL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffff);
diff --git a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/fesub.c b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/fesub.c
index f78c10471..7697d07d2 100644
--- a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/fesub.c
+++ b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffffffL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffff);
diff --git a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/fesubDisplay.log b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/fesubDisplay.log
index 410fead3f..9175c3383 100644
--- a/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e256m2e224p2e192p2e96m1/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffffL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffff);
diff --git a/src/Specific/montgomery64_2e256m2e32m977/feadd.c b/src/Specific/montgomery64_2e256m2e32m977/feadd.c
index d4568cb8e..14f720f2d 100644
--- a/src/Specific/montgomery64_2e256m2e32m977/feadd.c
+++ b/src/Specific/montgomery64_2e256m2e32m977/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0xffffffffffffffffL, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e256m2e32m977/feaddDisplay.log b/src/Specific/montgomery64_2e256m2e32m977/feaddDisplay.log
index efacf434c..ae304849e 100644
--- a/src/Specific/montgomery64_2e256m2e32m977/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e256m2e32m977/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0xffffffffffffffffL);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e256m2e32m977/femul.c b/src/Specific/montgomery64_2e256m2e32m977/femul.c
index eda5fd297..e6301b612 100644
--- a/src/Specific/montgomery64_2e256m2e32m977/femul.c
+++ b/src/Specific/montgomery64_2e256m2e32m977/femul.c
@@ -118,10 +118,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x335; uint8_t x336 = _subborrow_u64(x333, x322, 0xffffffffffffffffL, &x335);
   { uint64_t x338; uint8_t x339 = _subborrow_u64(x336, x325, 0xffffffffffffffffL, &x338);
   { uint64_t _; uint8_t x342 = _subborrow_u64(x339, x327, 0x0, &_);
-  { uint64_t x343 = cmovznz(x342, x338, x325);
-  { uint64_t x344 = cmovznz(x342, x335, x322);
-  { uint64_t x345 = cmovznz(x342, x332, x319);
-  { uint64_t x346 = cmovznz(x342, x329, x316);
+  { uint64_t x343 = cmovznz64(x342, x338, x325);
+  { uint64_t x344 = cmovznz64(x342, x335, x322);
+  { uint64_t x345 = cmovznz64(x342, x332, x319);
+  { uint64_t x346 = cmovznz64(x342, x329, x316);
   out[0] = x346;
   out[1] = x345;
   out[2] = x344;
diff --git a/src/Specific/montgomery64_2e256m2e32m977/femulDisplay.log b/src/Specific/montgomery64_2e256m2e32m977/femulDisplay.log
index ae8fdcc21..59bd5d082 100644
--- a/src/Specific/montgomery64_2e256m2e32m977/femulDisplay.log
+++ b/src/Specific/montgomery64_2e256m2e32m977/femulDisplay.log
@@ -113,10 +113,10 @@ Interp-η
  uint64_t x335, uint8_t x336 = subborrow_u64(x333, x322, 0xffffffffffffffffL);
  uint64_t x338, uint8_t x339 = subborrow_u64(x336, x325, 0xffffffffffffffffL);
  uint64_t _, uint8_t x342 = subborrow_u64(x339, x327, 0x0);
- uint64_t x343 = cmovznz(x342, x338, x325);
- uint64_t x344 = cmovznz(x342, x335, x322);
- uint64_t x345 = cmovznz(x342, x332, x319);
- uint64_t x346 = cmovznz(x342, x329, x316);
+ uint64_t x343 = cmovznz64(x342, x338, x325);
+ uint64_t x344 = cmovznz64(x342, x335, x322);
+ uint64_t x345 = cmovznz64(x342, x332, x319);
+ uint64_t x346 = cmovznz64(x342, x329, x316);
  return (x343, x344, x345, x346))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e256m2e32m977/feopp.c b/src/Specific/montgomery64_2e256m2e32m977/feopp.c
index cea8498a4..6461080dc 100644
--- a/src/Specific/montgomery64_2e256m2e32m977/feopp.c
+++ b/src/Specific/montgomery64_2e256m2e32m977/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffefffffc2fL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m2e32m977/feoppDisplay.log b/src/Specific/montgomery64_2e256m2e32m977/feoppDisplay.log
index 90afae4a1..b89811d28 100644
--- a/src/Specific/montgomery64_2e256m2e32m977/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e256m2e32m977/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffefffffc2fL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m2e32m977/fesub.c b/src/Specific/montgomery64_2e256m2e32m977/fesub.c
index ee5e2b88a..7bb6ec2a2 100644
--- a/src/Specific/montgomery64_2e256m2e32m977/fesub.c
+++ b/src/Specific/montgomery64_2e256m2e32m977/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xfffffffefffffc2fL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m2e32m977/fesubDisplay.log b/src/Specific/montgomery64_2e256m2e32m977/fesubDisplay.log
index 67ee9d972..fd2507333 100644
--- a/src/Specific/montgomery64_2e256m2e32m977/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e256m2e32m977/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xfffffffefffffc2fL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m88x2e240m1/feadd.c b/src/Specific/montgomery64_2e256m88x2e240m1/feadd.c
index b14154459..bc65ab093 100644
--- a/src/Specific/montgomery64_2e256m88x2e240m1/feadd.c
+++ b/src/Specific/montgomery64_2e256m88x2e240m1/feadd.c
@@ -16,10 +16,10 @@ static void feadd(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x35; uint8_t x36 = _subborrow_u64(x33, x23, 0xffffffffffffffffL, &x35);
   { uint64_t x38; uint8_t x39 = _subborrow_u64(x36, x26, 0xffa7ffffffffffffL, &x38);
   { uint64_t _; uint8_t x42 = _subborrow_u64(x39, x27, 0x0, &_);
-  { uint64_t x43 = cmovznz(x42, x38, x26);
-  { uint64_t x44 = cmovznz(x42, x35, x23);
-  { uint64_t x45 = cmovznz(x42, x32, x20);
-  { uint64_t x46 = cmovznz(x42, x29, x17);
+  { uint64_t x43 = cmovznz64(x42, x38, x26);
+  { uint64_t x44 = cmovznz64(x42, x35, x23);
+  { uint64_t x45 = cmovznz64(x42, x32, x20);
+  { uint64_t x46 = cmovznz64(x42, x29, x17);
   out[0] = x46;
   out[1] = x45;
   out[2] = x44;
diff --git a/src/Specific/montgomery64_2e256m88x2e240m1/feaddDisplay.log b/src/Specific/montgomery64_2e256m88x2e240m1/feaddDisplay.log
index 7c4667cc4..81d0d6f63 100644
--- a/src/Specific/montgomery64_2e256m88x2e240m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e256m88x2e240m1/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0xffffffffffffffffL);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0xffa7ffffffffffffL);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e256m88x2e240m1/femul.c b/src/Specific/montgomery64_2e256m88x2e240m1/femul.c
index 20f63131b..82b06c926 100644
--- a/src/Specific/montgomery64_2e256m88x2e240m1/femul.c
+++ b/src/Specific/montgomery64_2e256m88x2e240m1/femul.c
@@ -114,10 +114,10 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x323; uint8_t x324 = _subborrow_u64(x321, x310, 0xffffffffffffffffL, &x323);
   { uint64_t x326; uint8_t x327 = _subborrow_u64(x324, x313, 0xffa7ffffffffffffL, &x326);
   { uint64_t _; uint8_t x330 = _subborrow_u64(x327, x315, 0x0, &_);
-  { uint64_t x331 = cmovznz(x330, x326, x313);
-  { uint64_t x332 = cmovznz(x330, x323, x310);
-  { uint64_t x333 = cmovznz(x330, x320, x307);
-  { uint64_t x334 = cmovznz(x330, x317, x304);
+  { uint64_t x331 = cmovznz64(x330, x326, x313);
+  { uint64_t x332 = cmovznz64(x330, x323, x310);
+  { uint64_t x333 = cmovznz64(x330, x320, x307);
+  { uint64_t x334 = cmovznz64(x330, x317, x304);
   out[0] = x334;
   out[1] = x333;
   out[2] = x332;
diff --git a/src/Specific/montgomery64_2e256m88x2e240m1/femulDisplay.log b/src/Specific/montgomery64_2e256m88x2e240m1/femulDisplay.log
index 19f8879e3..aff28190a 100644
--- a/src/Specific/montgomery64_2e256m88x2e240m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e256m88x2e240m1/femulDisplay.log
@@ -109,10 +109,10 @@ Interp-η
  uint64_t x323, uint8_t x324 = subborrow_u64(x321, x310, 0xffffffffffffffffL);
  uint64_t x326, uint8_t x327 = subborrow_u64(x324, x313, 0xffa7ffffffffffffL);
  uint64_t _, uint8_t x330 = subborrow_u64(x327, x315, 0x0);
- uint64_t x331 = cmovznz(x330, x326, x313);
- uint64_t x332 = cmovznz(x330, x323, x310);
- uint64_t x333 = cmovznz(x330, x320, x307);
- uint64_t x334 = cmovznz(x330, x317, x304);
+ uint64_t x331 = cmovznz64(x330, x326, x313);
+ uint64_t x332 = cmovznz64(x330, x323, x310);
+ uint64_t x333 = cmovznz64(x330, x320, x307);
+ uint64_t x334 = cmovznz64(x330, x317, x304);
  return (x331, x332, x333, x334))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e256m88x2e240m1/feopp.c b/src/Specific/montgomery64_2e256m88x2e240m1/feopp.c
index f8f941e71..80cc7ff84 100644
--- a/src/Specific/montgomery64_2e256m88x2e240m1/feopp.c
+++ b/src/Specific/montgomery64_2e256m88x2e240m1/feopp.c
@@ -7,7 +7,7 @@ static void feopp(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u64(x9, 0x0, x4, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u64(x12, 0x0, x6, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u64(x15, 0x0, x5, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffffffL);
   { uint64_t x22; uint8_t x23 = _addcarryx_u64(0x0, x8, x20, &x22);
   { uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m88x2e240m1/feoppDisplay.log b/src/Specific/montgomery64_2e256m88x2e240m1/feoppDisplay.log
index b8ce976a0..216af93d4 100644
--- a/src/Specific/montgomery64_2e256m88x2e240m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e256m88x2e240m1/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffffL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m88x2e240m1/fesub.c b/src/Specific/montgomery64_2e256m88x2e240m1/fesub.c
index 73f919d5d..974f1cf0d 100644
--- a/src/Specific/montgomery64_2e256m88x2e240m1/fesub.c
+++ b/src/Specific/montgomery64_2e256m88x2e240m1/fesub.c
@@ -11,7 +11,7 @@ static void fesub(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x20; uint8_t x21 = _subborrow_u64(x18, x7, x13, &x20);
   { uint64_t x23; uint8_t x24 = _subborrow_u64(x21, x9, x15, &x23);
   { uint64_t x26; uint8_t x27 = _subborrow_u64(x24, x8, x14, &x26);
-  { uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+  { uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
   { uint64_t x29 = (x28 & 0xffffffffffffffffL);
   { uint64_t x31; uint8_t x32 = _addcarryx_u64(0x0, x17, x29, &x31);
   { uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e256m88x2e240m1/fesubDisplay.log b/src/Specific/montgomery64_2e256m88x2e240m1/fesubDisplay.log
index c8cfb7a24..bf22dbebe 100644
--- a/src/Specific/montgomery64_2e256m88x2e240m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e256m88x2e240m1/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffffL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e266m3/feadd.c b/src/Specific/montgomery64_2e266m3/feadd.c
index 40fa79633..74e984d17 100644
--- a/src/Specific/montgomery64_2e266m3/feadd.c
+++ b/src/Specific/montgomery64_2e266m3/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint64_t out[5], const uint64_t in1[5], const uint64_t in2[5])
   { uint64_t x45; uint8_t x46 = _subborrow_u64(x43, x30, 0xffffffffffffffffL, &x45);
   { uint64_t x48; uint8_t x49 = _subborrow_u64(x46, x33, 0x3ff, &x48);
   { uint64_t _; uint8_t x52 = _subborrow_u64(x49, x34, 0x0, &_);
-  { uint64_t x53 = cmovznz(x52, x48, x33);
-  { uint64_t x54 = cmovznz(x52, x45, x30);
-  { uint64_t x55 = cmovznz(x52, x42, x27);
-  { uint64_t x56 = cmovznz(x52, x39, x24);
-  { uint64_t x57 = cmovznz(x52, x36, x21);
+  { uint64_t x53 = cmovznz64(x52, x48, x33);
+  { uint64_t x54 = cmovznz64(x52, x45, x30);
+  { uint64_t x55 = cmovznz64(x52, x42, x27);
+  { uint64_t x56 = cmovznz64(x52, x39, x24);
+  { uint64_t x57 = cmovznz64(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery64_2e266m3/feaddDisplay.log b/src/Specific/montgomery64_2e266m3/feaddDisplay.log
index e01e2c9b9..5a46897ef 100644
--- a/src/Specific/montgomery64_2e266m3/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e266m3/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint64_t x45, uint8_t x46 = subborrow_u64(x43, x30, 0xffffffffffffffffL);
  uint64_t x48, uint8_t x49 = subborrow_u64(x46, x33, 0x3ff);
  uint64_t _, uint8_t x52 = subborrow_u64(x49, x34, 0x0);
- uint64_t x53 = cmovznz(x52, x48, x33);
- uint64_t x54 = cmovznz(x52, x45, x30);
- uint64_t x55 = cmovznz(x52, x42, x27);
- uint64_t x56 = cmovznz(x52, x39, x24);
- uint64_t x57 = cmovznz(x52, x36, x21);
+ uint64_t x53 = cmovznz64(x52, x48, x33);
+ uint64_t x54 = cmovznz64(x52, x45, x30);
+ uint64_t x55 = cmovznz64(x52, x42, x27);
+ uint64_t x56 = cmovznz64(x52, x39, x24);
+ uint64_t x57 = cmovznz64(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e266m3/femul.c b/src/Specific/montgomery64_2e266m3/femul.c
index 2b0513193..fb45d44d2 100644
--- a/src/Specific/montgomery64_2e266m3/femul.c
+++ b/src/Specific/montgomery64_2e266m3/femul.c
@@ -178,11 +178,11 @@ static void femul(uint64_t out[5], const uint64_t in1[5], const uint64_t in2[5])
   { uint64_t x511; uint8_t x512 = _subborrow_u64(x509, x495, 0xffffffffffffffffL, &x511);
   { uint64_t x514; uint8_t x515 = _subborrow_u64(x512, x498, 0x3ff, &x514);
   { uint64_t _; uint8_t x518 = _subborrow_u64(x515, x500, 0x0, &_);
-  { uint64_t x519 = cmovznz(x518, x514, x498);
-  { uint64_t x520 = cmovznz(x518, x511, x495);
-  { uint64_t x521 = cmovznz(x518, x508, x492);
-  { uint64_t x522 = cmovznz(x518, x505, x489);
-  { uint64_t x523 = cmovznz(x518, x502, x486);
+  { uint64_t x519 = cmovznz64(x518, x514, x498);
+  { uint64_t x520 = cmovznz64(x518, x511, x495);
+  { uint64_t x521 = cmovznz64(x518, x508, x492);
+  { uint64_t x522 = cmovznz64(x518, x505, x489);
+  { uint64_t x523 = cmovznz64(x518, x502, x486);
   out[0] = x523;
   out[1] = x522;
   out[2] = x521;
diff --git a/src/Specific/montgomery64_2e266m3/femulDisplay.log b/src/Specific/montgomery64_2e266m3/femulDisplay.log
index ab4337f01..d80a655d8 100644
--- a/src/Specific/montgomery64_2e266m3/femulDisplay.log
+++ b/src/Specific/montgomery64_2e266m3/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint64_t x511, uint8_t x512 = subborrow_u64(x509, x495, 0xffffffffffffffffL);
  uint64_t x514, uint8_t x515 = subborrow_u64(x512, x498, 0x3ff);
  uint64_t _, uint8_t x518 = subborrow_u64(x515, x500, 0x0);
- uint64_t x519 = cmovznz(x518, x514, x498);
- uint64_t x520 = cmovznz(x518, x511, x495);
- uint64_t x521 = cmovznz(x518, x508, x492);
- uint64_t x522 = cmovznz(x518, x505, x489);
- uint64_t x523 = cmovznz(x518, x502, x486);
+ uint64_t x519 = cmovznz64(x518, x514, x498);
+ uint64_t x520 = cmovznz64(x518, x511, x495);
+ uint64_t x521 = cmovznz64(x518, x508, x492);
+ uint64_t x522 = cmovznz64(x518, x505, x489);
+ uint64_t x523 = cmovznz64(x518, x502, x486);
  return (x519, x520, x521, x522, x523))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e266m3/feopp.c b/src/Specific/montgomery64_2e266m3/feopp.c
index 07873bc8f..73d56aa32 100644
--- a/src/Specific/montgomery64_2e266m3/feopp.c
+++ b/src/Specific/montgomery64_2e266m3/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, 0x0, x6, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, 0x0, x8, &x19);
   { uint64_t x22; uint8_t x23 = _subborrow_u64(x20, 0x0, x7, &x22);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0xfffffffffffffffdL);
   { uint64_t x27; uint8_t x28 = _addcarryx_u64(0x0, x10, x25, &x27);
   { uint64_t x29 = (x24 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e266m3/feoppDisplay.log b/src/Specific/montgomery64_2e266m3/feoppDisplay.log
index 1c175ffbe..fe7f00b63 100644
--- a/src/Specific/montgomery64_2e266m3/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e266m3/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, 0x0, x6);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, 0x0, x8);
  uint64_t x22, uint8_t x23 = subborrow_u64(x20, 0x0, x7);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0xfffffffffffffffdL);
  uint64_t x27, uint8_t x28 = addcarryx_u64(0x0, x10, x25);
  uint64_t x29 = (x24 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e266m3/fesub.c b/src/Specific/montgomery64_2e266m3/fesub.c
index fa38ecbb3..17bb0bd90 100644
--- a/src/Specific/montgomery64_2e266m3/fesub.c
+++ b/src/Specific/montgomery64_2e266m3/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint64_t out[5], const uint64_t in1[5], const uint64_t in2[5])
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, x9, x17, &x27);
   { uint64_t x30; uint8_t x31 = _subborrow_u64(x28, x11, x19, &x30);
   { uint64_t x33; uint8_t x34 = _subborrow_u64(x31, x10, x18, &x33);
-  { uint64_t x35 = (uint64_t)cmovznz(x34, 0x0, 0xffffffffffffffffL);
+  { uint64_t x35 = cmovznz64(x34, 0x0, 0xffffffffffffffffL);
   { uint64_t x36 = (x35 & 0xfffffffffffffffdL);
   { uint64_t x38; uint8_t x39 = _addcarryx_u64(0x0, x21, x36, &x38);
   { uint64_t x40 = (x35 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e266m3/fesubDisplay.log b/src/Specific/montgomery64_2e266m3/fesubDisplay.log
index d6b93201a..695b18f9a 100644
--- a/src/Specific/montgomery64_2e266m3/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e266m3/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, x9, x17);
  uint64_t x30, uint8_t x31 = subborrow_u64(x28, x11, x19);
  uint64_t x33, uint8_t x34 = subborrow_u64(x31, x10, x18);
- uint64_t x35 = (uint64_t)cmovznz(x34, 0x0, 0xffffffffffffffffL);
+ uint64_t x35 = cmovznz64(x34, 0x0, 0xffffffffffffffffL);
  uint64_t x36 = (x35 & 0xfffffffffffffffdL);
  uint64_t x38, uint8_t x39 = addcarryx_u64(0x0, x21, x36);
  uint64_t x40 = (x35 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e285m9/feadd.c b/src/Specific/montgomery64_2e285m9/feadd.c
index ac5360cf4..9ab6448cf 100644
--- a/src/Specific/montgomery64_2e285m9/feadd.c
+++ b/src/Specific/montgomery64_2e285m9/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint64_t out[5], const uint64_t in1[5], const uint64_t in2[5])
   { uint64_t x45; uint8_t x46 = _subborrow_u64(x43, x30, 0xffffffffffffffffL, &x45);
   { uint64_t x48; uint8_t x49 = _subborrow_u64(x46, x33, 0x1fffffff, &x48);
   { uint64_t _; uint8_t x52 = _subborrow_u64(x49, x34, 0x0, &_);
-  { uint64_t x53 = cmovznz(x52, x48, x33);
-  { uint64_t x54 = cmovznz(x52, x45, x30);
-  { uint64_t x55 = cmovznz(x52, x42, x27);
-  { uint64_t x56 = cmovznz(x52, x39, x24);
-  { uint64_t x57 = cmovznz(x52, x36, x21);
+  { uint64_t x53 = cmovznz64(x52, x48, x33);
+  { uint64_t x54 = cmovznz64(x52, x45, x30);
+  { uint64_t x55 = cmovznz64(x52, x42, x27);
+  { uint64_t x56 = cmovznz64(x52, x39, x24);
+  { uint64_t x57 = cmovznz64(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery64_2e285m9/feaddDisplay.log b/src/Specific/montgomery64_2e285m9/feaddDisplay.log
index 33169746d..5d3ecfdc2 100644
--- a/src/Specific/montgomery64_2e285m9/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e285m9/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint64_t x45, uint8_t x46 = subborrow_u64(x43, x30, 0xffffffffffffffffL);
  uint64_t x48, uint8_t x49 = subborrow_u64(x46, x33, 0x1fffffff);
  uint64_t _, uint8_t x52 = subborrow_u64(x49, x34, 0x0);
- uint64_t x53 = cmovznz(x52, x48, x33);
- uint64_t x54 = cmovznz(x52, x45, x30);
- uint64_t x55 = cmovznz(x52, x42, x27);
- uint64_t x56 = cmovznz(x52, x39, x24);
- uint64_t x57 = cmovznz(x52, x36, x21);
+ uint64_t x53 = cmovznz64(x52, x48, x33);
+ uint64_t x54 = cmovznz64(x52, x45, x30);
+ uint64_t x55 = cmovznz64(x52, x42, x27);
+ uint64_t x56 = cmovznz64(x52, x39, x24);
+ uint64_t x57 = cmovznz64(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e285m9/femul.c b/src/Specific/montgomery64_2e285m9/femul.c
index e8bd245e2..2adf31093 100644
--- a/src/Specific/montgomery64_2e285m9/femul.c
+++ b/src/Specific/montgomery64_2e285m9/femul.c
@@ -178,11 +178,11 @@ static void femul(uint64_t out[5], const uint64_t in1[5], const uint64_t in2[5])
   { uint64_t x511; uint8_t x512 = _subborrow_u64(x509, x495, 0xffffffffffffffffL, &x511);
   { uint64_t x514; uint8_t x515 = _subborrow_u64(x512, x498, 0x1fffffff, &x514);
   { uint64_t _; uint8_t x518 = _subborrow_u64(x515, x500, 0x0, &_);
-  { uint64_t x519 = cmovznz(x518, x514, x498);
-  { uint64_t x520 = cmovznz(x518, x511, x495);
-  { uint64_t x521 = cmovznz(x518, x508, x492);
-  { uint64_t x522 = cmovznz(x518, x505, x489);
-  { uint64_t x523 = cmovznz(x518, x502, x486);
+  { uint64_t x519 = cmovznz64(x518, x514, x498);
+  { uint64_t x520 = cmovznz64(x518, x511, x495);
+  { uint64_t x521 = cmovznz64(x518, x508, x492);
+  { uint64_t x522 = cmovznz64(x518, x505, x489);
+  { uint64_t x523 = cmovznz64(x518, x502, x486);
   out[0] = x523;
   out[1] = x522;
   out[2] = x521;
diff --git a/src/Specific/montgomery64_2e285m9/femulDisplay.log b/src/Specific/montgomery64_2e285m9/femulDisplay.log
index 6beffa425..c6e894c2b 100644
--- a/src/Specific/montgomery64_2e285m9/femulDisplay.log
+++ b/src/Specific/montgomery64_2e285m9/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint64_t x511, uint8_t x512 = subborrow_u64(x509, x495, 0xffffffffffffffffL);
  uint64_t x514, uint8_t x515 = subborrow_u64(x512, x498, 0x1fffffff);
  uint64_t _, uint8_t x518 = subborrow_u64(x515, x500, 0x0);
- uint64_t x519 = cmovznz(x518, x514, x498);
- uint64_t x520 = cmovznz(x518, x511, x495);
- uint64_t x521 = cmovznz(x518, x508, x492);
- uint64_t x522 = cmovznz(x518, x505, x489);
- uint64_t x523 = cmovznz(x518, x502, x486);
+ uint64_t x519 = cmovznz64(x518, x514, x498);
+ uint64_t x520 = cmovznz64(x518, x511, x495);
+ uint64_t x521 = cmovznz64(x518, x508, x492);
+ uint64_t x522 = cmovznz64(x518, x505, x489);
+ uint64_t x523 = cmovznz64(x518, x502, x486);
  return (x519, x520, x521, x522, x523))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e285m9/feopp.c b/src/Specific/montgomery64_2e285m9/feopp.c
index 65409d0ee..64e1b5bd1 100644
--- a/src/Specific/montgomery64_2e285m9/feopp.c
+++ b/src/Specific/montgomery64_2e285m9/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, 0x0, x6, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, 0x0, x8, &x19);
   { uint64_t x22; uint8_t x23 = _subborrow_u64(x20, 0x0, x7, &x22);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0xfffffffffffffff7L);
   { uint64_t x27; uint8_t x28 = _addcarryx_u64(0x0, x10, x25, &x27);
   { uint64_t x29 = (x24 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e285m9/feoppDisplay.log b/src/Specific/montgomery64_2e285m9/feoppDisplay.log
index 353723b2e..68ec2f162 100644
--- a/src/Specific/montgomery64_2e285m9/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e285m9/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, 0x0, x6);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, 0x0, x8);
  uint64_t x22, uint8_t x23 = subborrow_u64(x20, 0x0, x7);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0xfffffffffffffff7L);
  uint64_t x27, uint8_t x28 = addcarryx_u64(0x0, x10, x25);
  uint64_t x29 = (x24 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e285m9/fesub.c b/src/Specific/montgomery64_2e285m9/fesub.c
index 4b23709de..12c16d5f5 100644
--- a/src/Specific/montgomery64_2e285m9/fesub.c
+++ b/src/Specific/montgomery64_2e285m9/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint64_t out[5], const uint64_t in1[5], const uint64_t in2[5])
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, x9, x17, &x27);
   { uint64_t x30; uint8_t x31 = _subborrow_u64(x28, x11, x19, &x30);
   { uint64_t x33; uint8_t x34 = _subborrow_u64(x31, x10, x18, &x33);
-  { uint64_t x35 = (uint64_t)cmovznz(x34, 0x0, 0xffffffffffffffffL);
+  { uint64_t x35 = cmovznz64(x34, 0x0, 0xffffffffffffffffL);
   { uint64_t x36 = (x35 & 0xfffffffffffffff7L);
   { uint64_t x38; uint8_t x39 = _addcarryx_u64(0x0, x21, x36, &x38);
   { uint64_t x40 = (x35 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e285m9/fesubDisplay.log b/src/Specific/montgomery64_2e285m9/fesubDisplay.log
index bca15e00c..f6cdb966c 100644
--- a/src/Specific/montgomery64_2e285m9/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e285m9/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, x9, x17);
  uint64_t x30, uint8_t x31 = subborrow_u64(x28, x11, x19);
  uint64_t x33, uint8_t x34 = subborrow_u64(x31, x10, x18);
- uint64_t x35 = (uint64_t)cmovznz(x34, 0x0, 0xffffffffffffffffL);
+ uint64_t x35 = cmovznz64(x34, 0x0, 0xffffffffffffffffL);
  uint64_t x36 = (x35 & 0xfffffffffffffff7L);
  uint64_t x38, uint8_t x39 = addcarryx_u64(0x0, x21, x36);
  uint64_t x40 = (x35 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e291m19/feadd.c b/src/Specific/montgomery64_2e291m19/feadd.c
index 7962323ed..d7626cf52 100644
--- a/src/Specific/montgomery64_2e291m19/feadd.c
+++ b/src/Specific/montgomery64_2e291m19/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint64_t out[5], const uint64_t in1[5], const uint64_t in2[5])
   { uint64_t x45; uint8_t x46 = _subborrow_u64(x43, x30, 0xffffffffffffffffL, &x45);
   { uint64_t x48; uint8_t x49 = _subborrow_u64(x46, x33, 0x7ffffffff, &x48);
   { uint64_t _; uint8_t x52 = _subborrow_u64(x49, x34, 0x0, &_);
-  { uint64_t x53 = cmovznz(x52, x48, x33);
-  { uint64_t x54 = cmovznz(x52, x45, x30);
-  { uint64_t x55 = cmovznz(x52, x42, x27);
-  { uint64_t x56 = cmovznz(x52, x39, x24);
-  { uint64_t x57 = cmovznz(x52, x36, x21);
+  { uint64_t x53 = cmovznz64(x52, x48, x33);
+  { uint64_t x54 = cmovznz64(x52, x45, x30);
+  { uint64_t x55 = cmovznz64(x52, x42, x27);
+  { uint64_t x56 = cmovznz64(x52, x39, x24);
+  { uint64_t x57 = cmovznz64(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery64_2e291m19/feaddDisplay.log b/src/Specific/montgomery64_2e291m19/feaddDisplay.log
index fa2ebf1f6..0475ac351 100644
--- a/src/Specific/montgomery64_2e291m19/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e291m19/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint64_t x45, uint8_t x46 = subborrow_u64(x43, x30, 0xffffffffffffffffL);
  uint64_t x48, uint8_t x49 = subborrow_u64(x46, x33, 0x7ffffffff);
  uint64_t _, uint8_t x52 = subborrow_u64(x49, x34, 0x0);
- uint64_t x53 = cmovznz(x52, x48, x33);
- uint64_t x54 = cmovznz(x52, x45, x30);
- uint64_t x55 = cmovznz(x52, x42, x27);
- uint64_t x56 = cmovznz(x52, x39, x24);
- uint64_t x57 = cmovznz(x52, x36, x21);
+ uint64_t x53 = cmovznz64(x52, x48, x33);
+ uint64_t x54 = cmovznz64(x52, x45, x30);
+ uint64_t x55 = cmovznz64(x52, x42, x27);
+ uint64_t x56 = cmovznz64(x52, x39, x24);
+ uint64_t x57 = cmovznz64(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e291m19/femul.c b/src/Specific/montgomery64_2e291m19/femul.c
index 5432d7124..13d0393aa 100644
--- a/src/Specific/montgomery64_2e291m19/femul.c
+++ b/src/Specific/montgomery64_2e291m19/femul.c
@@ -178,11 +178,11 @@ static void femul(uint64_t out[5], const uint64_t in1[5], const uint64_t in2[5])
   { uint64_t x511; uint8_t x512 = _subborrow_u64(x509, x495, 0xffffffffffffffffL, &x511);
   { uint64_t x514; uint8_t x515 = _subborrow_u64(x512, x498, 0x7ffffffff, &x514);
   { uint64_t _; uint8_t x518 = _subborrow_u64(x515, x500, 0x0, &_);
-  { uint64_t x519 = cmovznz(x518, x514, x498);
-  { uint64_t x520 = cmovznz(x518, x511, x495);
-  { uint64_t x521 = cmovznz(x518, x508, x492);
-  { uint64_t x522 = cmovznz(x518, x505, x489);
-  { uint64_t x523 = cmovznz(x518, x502, x486);
+  { uint64_t x519 = cmovznz64(x518, x514, x498);
+  { uint64_t x520 = cmovznz64(x518, x511, x495);
+  { uint64_t x521 = cmovznz64(x518, x508, x492);
+  { uint64_t x522 = cmovznz64(x518, x505, x489);
+  { uint64_t x523 = cmovznz64(x518, x502, x486);
   out[0] = x523;
   out[1] = x522;
   out[2] = x521;
diff --git a/src/Specific/montgomery64_2e291m19/femulDisplay.log b/src/Specific/montgomery64_2e291m19/femulDisplay.log
index bb1b2a001..5cf09abe3 100644
--- a/src/Specific/montgomery64_2e291m19/femulDisplay.log
+++ b/src/Specific/montgomery64_2e291m19/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint64_t x511, uint8_t x512 = subborrow_u64(x509, x495, 0xffffffffffffffffL);
  uint64_t x514, uint8_t x515 = subborrow_u64(x512, x498, 0x7ffffffff);
  uint64_t _, uint8_t x518 = subborrow_u64(x515, x500, 0x0);
- uint64_t x519 = cmovznz(x518, x514, x498);
- uint64_t x520 = cmovznz(x518, x511, x495);
- uint64_t x521 = cmovznz(x518, x508, x492);
- uint64_t x522 = cmovznz(x518, x505, x489);
- uint64_t x523 = cmovznz(x518, x502, x486);
+ uint64_t x519 = cmovznz64(x518, x514, x498);
+ uint64_t x520 = cmovznz64(x518, x511, x495);
+ uint64_t x521 = cmovznz64(x518, x508, x492);
+ uint64_t x522 = cmovznz64(x518, x505, x489);
+ uint64_t x523 = cmovznz64(x518, x502, x486);
  return (x519, x520, x521, x522, x523))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e291m19/feopp.c b/src/Specific/montgomery64_2e291m19/feopp.c
index 88987b5fd..31390ffd8 100644
--- a/src/Specific/montgomery64_2e291m19/feopp.c
+++ b/src/Specific/montgomery64_2e291m19/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16; uint8_t x17 = _subborrow_u64(x14, 0x0, x6, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u64(x17, 0x0, x8, &x19);
   { uint64_t x22; uint8_t x23 = _subborrow_u64(x20, 0x0, x7, &x22);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0xffffffffffffffedL);
   { uint64_t x27; uint8_t x28 = _addcarryx_u64(0x0, x10, x25, &x27);
   { uint64_t x29 = (x24 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e291m19/feoppDisplay.log b/src/Specific/montgomery64_2e291m19/feoppDisplay.log
index a97bfc75b..5c4609742 100644
--- a/src/Specific/montgomery64_2e291m19/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e291m19/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = subborrow_u64(x14, 0x0, x6);
  uint64_t x19, uint8_t x20 = subborrow_u64(x17, 0x0, x8);
  uint64_t x22, uint8_t x23 = subborrow_u64(x20, 0x0, x7);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0xffffffffffffffedL);
  uint64_t x27, uint8_t x28 = addcarryx_u64(0x0, x10, x25);
  uint64_t x29 = (x24 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e291m19/fesub.c b/src/Specific/montgomery64_2e291m19/fesub.c
index bc9a9496c..cfc10c92f 100644
--- a/src/Specific/montgomery64_2e291m19/fesub.c
+++ b/src/Specific/montgomery64_2e291m19/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint64_t out[5], const uint64_t in1[5], const uint64_t in2[5])
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, x9, x17, &x27);
   { uint64_t x30; uint8_t x31 = _subborrow_u64(x28, x11, x19, &x30);
   { uint64_t x33; uint8_t x34 = _subborrow_u64(x31, x10, x18, &x33);
-  { uint64_t x35 = (uint64_t)cmovznz(x34, 0x0, 0xffffffffffffffffL);
+  { uint64_t x35 = cmovznz64(x34, 0x0, 0xffffffffffffffffL);
   { uint64_t x36 = (x35 & 0xffffffffffffffedL);
   { uint64_t x38; uint8_t x39 = _addcarryx_u64(0x0, x21, x36, &x38);
   { uint64_t x40 = (x35 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e291m19/fesubDisplay.log b/src/Specific/montgomery64_2e291m19/fesubDisplay.log
index 6f061bf3c..75ea81a86 100644
--- a/src/Specific/montgomery64_2e291m19/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e291m19/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, x9, x17);
  uint64_t x30, uint8_t x31 = subborrow_u64(x28, x11, x19);
  uint64_t x33, uint8_t x34 = subborrow_u64(x31, x10, x18);
- uint64_t x35 = (uint64_t)cmovznz(x34, 0x0, 0xffffffffffffffffL);
+ uint64_t x35 = cmovznz64(x34, 0x0, 0xffffffffffffffffL);
  uint64_t x36 = (x35 & 0xffffffffffffffedL);
  uint64_t x38, uint8_t x39 = addcarryx_u64(0x0, x21, x36);
  uint64_t x40 = (x35 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e321m9/feadd.c b/src/Specific/montgomery64_2e321m9/feadd.c
index 71ed9e56d..a995a347f 100644
--- a/src/Specific/montgomery64_2e321m9/feadd.c
+++ b/src/Specific/montgomery64_2e321m9/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0x1, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e321m9/feaddDisplay.log b/src/Specific/montgomery64_2e321m9/feaddDisplay.log
index 8dff26a73..7af9dbdbc 100644
--- a/src/Specific/montgomery64_2e321m9/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e321m9/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0x1);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e321m9/femul.c b/src/Specific/montgomery64_2e321m9/femul.c
index d5c7ea9d1..b56aef734 100644
--- a/src/Specific/montgomery64_2e321m9/femul.c
+++ b/src/Specific/montgomery64_2e321m9/femul.c
@@ -238,12 +238,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x687; uint8_t x688 = _subborrow_u64(x685, x668, 0xffffffffffffffffL, &x687);
   { uint64_t x690; uint8_t x691 = _subborrow_u64(x688, x671, 0x1, &x690);
   { uint64_t _; uint8_t x694 = _subborrow_u64(x691, x673, 0x0, &_);
-  { uint64_t x695 = cmovznz(x694, x690, x671);
-  { uint64_t x696 = cmovznz(x694, x687, x668);
-  { uint64_t x697 = cmovznz(x694, x684, x665);
-  { uint64_t x698 = cmovznz(x694, x681, x662);
-  { uint64_t x699 = cmovznz(x694, x678, x659);
-  { uint64_t x700 = cmovznz(x694, x675, x656);
+  { uint64_t x695 = cmovznz64(x694, x690, x671);
+  { uint64_t x696 = cmovznz64(x694, x687, x668);
+  { uint64_t x697 = cmovznz64(x694, x684, x665);
+  { uint64_t x698 = cmovznz64(x694, x681, x662);
+  { uint64_t x699 = cmovznz64(x694, x678, x659);
+  { uint64_t x700 = cmovznz64(x694, x675, x656);
   out[0] = x700;
   out[1] = x699;
   out[2] = x698;
diff --git a/src/Specific/montgomery64_2e321m9/femulDisplay.log b/src/Specific/montgomery64_2e321m9/femulDisplay.log
index a85fcd065..adf3b5b55 100644
--- a/src/Specific/montgomery64_2e321m9/femulDisplay.log
+++ b/src/Specific/montgomery64_2e321m9/femulDisplay.log
@@ -229,12 +229,12 @@ Interp-η
  uint64_t x687, uint8_t x688 = subborrow_u64(x685, x668, 0xffffffffffffffffL);
  uint64_t x690, uint8_t x691 = subborrow_u64(x688, x671, 0x1);
  uint64_t _, uint8_t x694 = subborrow_u64(x691, x673, 0x0);
- uint64_t x695 = cmovznz(x694, x690, x671);
- uint64_t x696 = cmovznz(x694, x687, x668);
- uint64_t x697 = cmovznz(x694, x684, x665);
- uint64_t x698 = cmovznz(x694, x681, x662);
- uint64_t x699 = cmovznz(x694, x678, x659);
- uint64_t x700 = cmovznz(x694, x675, x656);
+ uint64_t x695 = cmovznz64(x694, x690, x671);
+ uint64_t x696 = cmovznz64(x694, x687, x668);
+ uint64_t x697 = cmovznz64(x694, x684, x665);
+ uint64_t x698 = cmovznz64(x694, x681, x662);
+ uint64_t x699 = cmovznz64(x694, x678, x659);
+ uint64_t x700 = cmovznz64(x694, x675, x656);
  return (x695, x696, x697, x698, x699, x700))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e321m9/feopp.c b/src/Specific/montgomery64_2e321m9/feopp.c
index cc56acb08..f0a4603ea 100644
--- a/src/Specific/montgomery64_2e321m9/feopp.c
+++ b/src/Specific/montgomery64_2e321m9/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xfffffffffffffff7L);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e321m9/feoppDisplay.log b/src/Specific/montgomery64_2e321m9/feoppDisplay.log
index 5a1e63042..07d8bfd39 100644
--- a/src/Specific/montgomery64_2e321m9/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e321m9/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xfffffffffffffff7L);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e321m9/fesub.c b/src/Specific/montgomery64_2e321m9/fesub.c
index 06b816e57..5bb8fc37b 100644
--- a/src/Specific/montgomery64_2e321m9/fesub.c
+++ b/src/Specific/montgomery64_2e321m9/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xfffffffffffffff7L);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e321m9/fesubDisplay.log b/src/Specific/montgomery64_2e321m9/fesubDisplay.log
index 6c440ee94..482ae2c09 100644
--- a/src/Specific/montgomery64_2e321m9/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e321m9/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xfffffffffffffff7L);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e322m2e161m1/feadd.c b/src/Specific/montgomery64_2e322m2e161m1/feadd.c
index 4ea74fcaf..44531fadd 100644
--- a/src/Specific/montgomery64_2e322m2e161m1/feadd.c
+++ b/src/Specific/montgomery64_2e322m2e161m1/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0x3, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e322m2e161m1/feaddDisplay.log b/src/Specific/montgomery64_2e322m2e161m1/feaddDisplay.log
index f8229dbb1..407fc8bb8 100644
--- a/src/Specific/montgomery64_2e322m2e161m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e322m2e161m1/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0x3);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e322m2e161m1/femul.c b/src/Specific/montgomery64_2e322m2e161m1/femul.c
index 0652874d0..21650b616 100644
--- a/src/Specific/montgomery64_2e322m2e161m1/femul.c
+++ b/src/Specific/montgomery64_2e322m2e161m1/femul.c
@@ -244,12 +244,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x693; uint8_t x694 = _subborrow_u64(x691, x674, 0xffffffffffffffffL, &x693);
   { uint64_t x696; uint8_t x697 = _subborrow_u64(x694, x677, 0x3, &x696);
   { uint64_t _; uint8_t x700 = _subborrow_u64(x697, x679, 0x0, &_);
-  { uint64_t x701 = cmovznz(x700, x696, x677);
-  { uint64_t x702 = cmovznz(x700, x693, x674);
-  { uint64_t x703 = cmovznz(x700, x690, x671);
-  { uint64_t x704 = cmovznz(x700, x687, x668);
-  { uint64_t x705 = cmovznz(x700, x684, x665);
-  { uint64_t x706 = cmovznz(x700, x681, x662);
+  { uint64_t x701 = cmovznz64(x700, x696, x677);
+  { uint64_t x702 = cmovznz64(x700, x693, x674);
+  { uint64_t x703 = cmovznz64(x700, x690, x671);
+  { uint64_t x704 = cmovznz64(x700, x687, x668);
+  { uint64_t x705 = cmovznz64(x700, x684, x665);
+  { uint64_t x706 = cmovznz64(x700, x681, x662);
   out[0] = x706;
   out[1] = x705;
   out[2] = x704;
diff --git a/src/Specific/montgomery64_2e322m2e161m1/femulDisplay.log b/src/Specific/montgomery64_2e322m2e161m1/femulDisplay.log
index a36b29ec1..bd69c25d5 100644
--- a/src/Specific/montgomery64_2e322m2e161m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e322m2e161m1/femulDisplay.log
@@ -235,12 +235,12 @@ Interp-η
  uint64_t x693, uint8_t x694 = subborrow_u64(x691, x674, 0xffffffffffffffffL);
  uint64_t x696, uint8_t x697 = subborrow_u64(x694, x677, 0x3);
  uint64_t _, uint8_t x700 = subborrow_u64(x697, x679, 0x0);
- uint64_t x701 = cmovznz(x700, x696, x677);
- uint64_t x702 = cmovznz(x700, x693, x674);
- uint64_t x703 = cmovznz(x700, x690, x671);
- uint64_t x704 = cmovznz(x700, x687, x668);
- uint64_t x705 = cmovznz(x700, x684, x665);
- uint64_t x706 = cmovznz(x700, x681, x662);
+ uint64_t x701 = cmovznz64(x700, x696, x677);
+ uint64_t x702 = cmovznz64(x700, x693, x674);
+ uint64_t x703 = cmovznz64(x700, x690, x671);
+ uint64_t x704 = cmovznz64(x700, x687, x668);
+ uint64_t x705 = cmovznz64(x700, x684, x665);
+ uint64_t x706 = cmovznz64(x700, x681, x662);
  return (x701, x702, x703, x704, x705, x706))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e322m2e161m1/feopp.c b/src/Specific/montgomery64_2e322m2e161m1/feopp.c
index 20fac0a32..7445311c5 100644
--- a/src/Specific/montgomery64_2e322m2e161m1/feopp.c
+++ b/src/Specific/montgomery64_2e322m2e161m1/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xffffffffffffffffL);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e322m2e161m1/feoppDisplay.log b/src/Specific/montgomery64_2e322m2e161m1/feoppDisplay.log
index 01c38142e..2dee04d64 100644
--- a/src/Specific/montgomery64_2e322m2e161m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e322m2e161m1/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xffffffffffffffffL);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e322m2e161m1/fesub.c b/src/Specific/montgomery64_2e322m2e161m1/fesub.c
index 82c028b3d..587de6e27 100644
--- a/src/Specific/montgomery64_2e322m2e161m1/fesub.c
+++ b/src/Specific/montgomery64_2e322m2e161m1/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xffffffffffffffffL);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e322m2e161m1/fesubDisplay.log b/src/Specific/montgomery64_2e322m2e161m1/fesubDisplay.log
index 868259f7b..3068ccc4e 100644
--- a/src/Specific/montgomery64_2e322m2e161m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e322m2e161m1/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xffffffffffffffffL);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e336m17/feadd.c b/src/Specific/montgomery64_2e336m17/feadd.c
index e98ee655f..3d3730fc9 100644
--- a/src/Specific/montgomery64_2e336m17/feadd.c
+++ b/src/Specific/montgomery64_2e336m17/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0xffff, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e336m17/feaddDisplay.log b/src/Specific/montgomery64_2e336m17/feaddDisplay.log
index 433761cb0..12075332c 100644
--- a/src/Specific/montgomery64_2e336m17/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e336m17/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0xffff);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e336m17/femul.c b/src/Specific/montgomery64_2e336m17/femul.c
index d6093aeec..fdc0e2bd4 100644
--- a/src/Specific/montgomery64_2e336m17/femul.c
+++ b/src/Specific/montgomery64_2e336m17/femul.c
@@ -250,12 +250,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x723; uint8_t x724 = _subborrow_u64(x721, x704, 0xffffffffffffffffL, &x723);
   { uint64_t x726; uint8_t x727 = _subborrow_u64(x724, x707, 0xffff, &x726);
   { uint64_t _; uint8_t x730 = _subborrow_u64(x727, x709, 0x0, &_);
-  { uint64_t x731 = cmovznz(x730, x726, x707);
-  { uint64_t x732 = cmovznz(x730, x723, x704);
-  { uint64_t x733 = cmovznz(x730, x720, x701);
-  { uint64_t x734 = cmovznz(x730, x717, x698);
-  { uint64_t x735 = cmovznz(x730, x714, x695);
-  { uint64_t x736 = cmovznz(x730, x711, x692);
+  { uint64_t x731 = cmovznz64(x730, x726, x707);
+  { uint64_t x732 = cmovznz64(x730, x723, x704);
+  { uint64_t x733 = cmovznz64(x730, x720, x701);
+  { uint64_t x734 = cmovznz64(x730, x717, x698);
+  { uint64_t x735 = cmovznz64(x730, x714, x695);
+  { uint64_t x736 = cmovznz64(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery64_2e336m17/femulDisplay.log b/src/Specific/montgomery64_2e336m17/femulDisplay.log
index c2dc794ff..491804734 100644
--- a/src/Specific/montgomery64_2e336m17/femulDisplay.log
+++ b/src/Specific/montgomery64_2e336m17/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint64_t x723, uint8_t x724 = subborrow_u64(x721, x704, 0xffffffffffffffffL);
  uint64_t x726, uint8_t x727 = subborrow_u64(x724, x707, 0xffff);
  uint64_t _, uint8_t x730 = subborrow_u64(x727, x709, 0x0);
- uint64_t x731 = cmovznz(x730, x726, x707);
- uint64_t x732 = cmovznz(x730, x723, x704);
- uint64_t x733 = cmovznz(x730, x720, x701);
- uint64_t x734 = cmovznz(x730, x717, x698);
- uint64_t x735 = cmovznz(x730, x714, x695);
- uint64_t x736 = cmovznz(x730, x711, x692);
+ uint64_t x731 = cmovznz64(x730, x726, x707);
+ uint64_t x732 = cmovznz64(x730, x723, x704);
+ uint64_t x733 = cmovznz64(x730, x720, x701);
+ uint64_t x734 = cmovznz64(x730, x717, x698);
+ uint64_t x735 = cmovznz64(x730, x714, x695);
+ uint64_t x736 = cmovznz64(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e336m17/feopp.c b/src/Specific/montgomery64_2e336m17/feopp.c
index 8b88c3d4b..c3255daf6 100644
--- a/src/Specific/montgomery64_2e336m17/feopp.c
+++ b/src/Specific/montgomery64_2e336m17/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xffffffffffffffefL);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e336m17/feoppDisplay.log b/src/Specific/montgomery64_2e336m17/feoppDisplay.log
index fd6f66f62..272ed2bf5 100644
--- a/src/Specific/montgomery64_2e336m17/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e336m17/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xffffffffffffffefL);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e336m17/fesub.c b/src/Specific/montgomery64_2e336m17/fesub.c
index 01ec66a18..a0b2a3273 100644
--- a/src/Specific/montgomery64_2e336m17/fesub.c
+++ b/src/Specific/montgomery64_2e336m17/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xffffffffffffffefL);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e336m17/fesubDisplay.log b/src/Specific/montgomery64_2e336m17/fesubDisplay.log
index 3f0f4080b..1c36f7753 100644
--- a/src/Specific/montgomery64_2e336m17/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e336m17/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xffffffffffffffefL);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e336m3/feadd.c b/src/Specific/montgomery64_2e336m3/feadd.c
index 3d4dd3146..f9e5f21b7 100644
--- a/src/Specific/montgomery64_2e336m3/feadd.c
+++ b/src/Specific/montgomery64_2e336m3/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0xffff, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e336m3/feaddDisplay.log b/src/Specific/montgomery64_2e336m3/feaddDisplay.log
index 8bd0639f9..bba653e9a 100644
--- a/src/Specific/montgomery64_2e336m3/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e336m3/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0xffff);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e336m3/femul.c b/src/Specific/montgomery64_2e336m3/femul.c
index 3b4e8ef84..ef7679b78 100644
--- a/src/Specific/montgomery64_2e336m3/femul.c
+++ b/src/Specific/montgomery64_2e336m3/femul.c
@@ -250,12 +250,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x723; uint8_t x724 = _subborrow_u64(x721, x704, 0xffffffffffffffffL, &x723);
   { uint64_t x726; uint8_t x727 = _subborrow_u64(x724, x707, 0xffff, &x726);
   { uint64_t _; uint8_t x730 = _subborrow_u64(x727, x709, 0x0, &_);
-  { uint64_t x731 = cmovznz(x730, x726, x707);
-  { uint64_t x732 = cmovznz(x730, x723, x704);
-  { uint64_t x733 = cmovznz(x730, x720, x701);
-  { uint64_t x734 = cmovznz(x730, x717, x698);
-  { uint64_t x735 = cmovznz(x730, x714, x695);
-  { uint64_t x736 = cmovznz(x730, x711, x692);
+  { uint64_t x731 = cmovznz64(x730, x726, x707);
+  { uint64_t x732 = cmovznz64(x730, x723, x704);
+  { uint64_t x733 = cmovznz64(x730, x720, x701);
+  { uint64_t x734 = cmovznz64(x730, x717, x698);
+  { uint64_t x735 = cmovznz64(x730, x714, x695);
+  { uint64_t x736 = cmovznz64(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery64_2e336m3/femulDisplay.log b/src/Specific/montgomery64_2e336m3/femulDisplay.log
index 2d32d938d..329612ea5 100644
--- a/src/Specific/montgomery64_2e336m3/femulDisplay.log
+++ b/src/Specific/montgomery64_2e336m3/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint64_t x723, uint8_t x724 = subborrow_u64(x721, x704, 0xffffffffffffffffL);
  uint64_t x726, uint8_t x727 = subborrow_u64(x724, x707, 0xffff);
  uint64_t _, uint8_t x730 = subborrow_u64(x727, x709, 0x0);
- uint64_t x731 = cmovznz(x730, x726, x707);
- uint64_t x732 = cmovznz(x730, x723, x704);
- uint64_t x733 = cmovznz(x730, x720, x701);
- uint64_t x734 = cmovznz(x730, x717, x698);
- uint64_t x735 = cmovznz(x730, x714, x695);
- uint64_t x736 = cmovznz(x730, x711, x692);
+ uint64_t x731 = cmovznz64(x730, x726, x707);
+ uint64_t x732 = cmovznz64(x730, x723, x704);
+ uint64_t x733 = cmovznz64(x730, x720, x701);
+ uint64_t x734 = cmovznz64(x730, x717, x698);
+ uint64_t x735 = cmovznz64(x730, x714, x695);
+ uint64_t x736 = cmovznz64(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e336m3/feopp.c b/src/Specific/montgomery64_2e336m3/feopp.c
index 08c26ff7b..17bbd7bd0 100644
--- a/src/Specific/montgomery64_2e336m3/feopp.c
+++ b/src/Specific/montgomery64_2e336m3/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xfffffffffffffffdL);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e336m3/feoppDisplay.log b/src/Specific/montgomery64_2e336m3/feoppDisplay.log
index f8dfbe0d3..1591801df 100644
--- a/src/Specific/montgomery64_2e336m3/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e336m3/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xfffffffffffffffdL);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e336m3/fesub.c b/src/Specific/montgomery64_2e336m3/fesub.c
index bc6f89b2a..a765dc44e 100644
--- a/src/Specific/montgomery64_2e336m3/fesub.c
+++ b/src/Specific/montgomery64_2e336m3/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xfffffffffffffffdL);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e336m3/fesubDisplay.log b/src/Specific/montgomery64_2e336m3/fesubDisplay.log
index 2a17a5a66..ca77cd145 100644
--- a/src/Specific/montgomery64_2e336m3/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e336m3/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xfffffffffffffffdL);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e338m15/feadd.c b/src/Specific/montgomery64_2e338m15/feadd.c
index 2c9c7ee9c..32e3e705b 100644
--- a/src/Specific/montgomery64_2e338m15/feadd.c
+++ b/src/Specific/montgomery64_2e338m15/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0x3ffff, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e338m15/feaddDisplay.log b/src/Specific/montgomery64_2e338m15/feaddDisplay.log
index 901b6ee7f..5336bcf27 100644
--- a/src/Specific/montgomery64_2e338m15/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e338m15/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0x3ffff);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e338m15/femul.c b/src/Specific/montgomery64_2e338m15/femul.c
index e1d191853..90a1d477d 100644
--- a/src/Specific/montgomery64_2e338m15/femul.c
+++ b/src/Specific/montgomery64_2e338m15/femul.c
@@ -250,12 +250,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x723; uint8_t x724 = _subborrow_u64(x721, x704, 0xffffffffffffffffL, &x723);
   { uint64_t x726; uint8_t x727 = _subborrow_u64(x724, x707, 0x3ffff, &x726);
   { uint64_t _; uint8_t x730 = _subborrow_u64(x727, x709, 0x0, &_);
-  { uint64_t x731 = cmovznz(x730, x726, x707);
-  { uint64_t x732 = cmovznz(x730, x723, x704);
-  { uint64_t x733 = cmovznz(x730, x720, x701);
-  { uint64_t x734 = cmovznz(x730, x717, x698);
-  { uint64_t x735 = cmovznz(x730, x714, x695);
-  { uint64_t x736 = cmovznz(x730, x711, x692);
+  { uint64_t x731 = cmovznz64(x730, x726, x707);
+  { uint64_t x732 = cmovznz64(x730, x723, x704);
+  { uint64_t x733 = cmovznz64(x730, x720, x701);
+  { uint64_t x734 = cmovznz64(x730, x717, x698);
+  { uint64_t x735 = cmovznz64(x730, x714, x695);
+  { uint64_t x736 = cmovznz64(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery64_2e338m15/femulDisplay.log b/src/Specific/montgomery64_2e338m15/femulDisplay.log
index a3cd43f98..fda5a2d0a 100644
--- a/src/Specific/montgomery64_2e338m15/femulDisplay.log
+++ b/src/Specific/montgomery64_2e338m15/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint64_t x723, uint8_t x724 = subborrow_u64(x721, x704, 0xffffffffffffffffL);
  uint64_t x726, uint8_t x727 = subborrow_u64(x724, x707, 0x3ffff);
  uint64_t _, uint8_t x730 = subborrow_u64(x727, x709, 0x0);
- uint64_t x731 = cmovznz(x730, x726, x707);
- uint64_t x732 = cmovznz(x730, x723, x704);
- uint64_t x733 = cmovznz(x730, x720, x701);
- uint64_t x734 = cmovznz(x730, x717, x698);
- uint64_t x735 = cmovznz(x730, x714, x695);
- uint64_t x736 = cmovznz(x730, x711, x692);
+ uint64_t x731 = cmovznz64(x730, x726, x707);
+ uint64_t x732 = cmovznz64(x730, x723, x704);
+ uint64_t x733 = cmovznz64(x730, x720, x701);
+ uint64_t x734 = cmovznz64(x730, x717, x698);
+ uint64_t x735 = cmovznz64(x730, x714, x695);
+ uint64_t x736 = cmovznz64(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e338m15/feopp.c b/src/Specific/montgomery64_2e338m15/feopp.c
index 6f189861b..0ded68efb 100644
--- a/src/Specific/montgomery64_2e338m15/feopp.c
+++ b/src/Specific/montgomery64_2e338m15/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xfffffffffffffff1L);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e338m15/feoppDisplay.log b/src/Specific/montgomery64_2e338m15/feoppDisplay.log
index d21849ad1..eadb1d5a3 100644
--- a/src/Specific/montgomery64_2e338m15/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e338m15/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xfffffffffffffff1L);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e338m15/fesub.c b/src/Specific/montgomery64_2e338m15/fesub.c
index 112827e5f..5fbb3bd1e 100644
--- a/src/Specific/montgomery64_2e338m15/fesub.c
+++ b/src/Specific/montgomery64_2e338m15/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xfffffffffffffff1L);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e338m15/fesubDisplay.log b/src/Specific/montgomery64_2e338m15/fesubDisplay.log
index 66f5d5ee9..1a34e9483 100644
--- a/src/Specific/montgomery64_2e338m15/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e338m15/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xfffffffffffffff1L);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e369m25/feadd.c b/src/Specific/montgomery64_2e369m25/feadd.c
index 589dda723..45754f978 100644
--- a/src/Specific/montgomery64_2e369m25/feadd.c
+++ b/src/Specific/montgomery64_2e369m25/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0x1ffffffffffff, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e369m25/feaddDisplay.log b/src/Specific/montgomery64_2e369m25/feaddDisplay.log
index e5ecf09d2..cacc80702 100644
--- a/src/Specific/montgomery64_2e369m25/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e369m25/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0x1ffffffffffff);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e369m25/femul.c b/src/Specific/montgomery64_2e369m25/femul.c
index 1b98b998d..5ab804164 100644
--- a/src/Specific/montgomery64_2e369m25/femul.c
+++ b/src/Specific/montgomery64_2e369m25/femul.c
@@ -250,12 +250,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x723; uint8_t x724 = _subborrow_u64(x721, x704, 0xffffffffffffffffL, &x723);
   { uint64_t x726; uint8_t x727 = _subborrow_u64(x724, x707, 0x1ffffffffffff, &x726);
   { uint64_t _; uint8_t x730 = _subborrow_u64(x727, x709, 0x0, &_);
-  { uint64_t x731 = cmovznz(x730, x726, x707);
-  { uint64_t x732 = cmovznz(x730, x723, x704);
-  { uint64_t x733 = cmovznz(x730, x720, x701);
-  { uint64_t x734 = cmovznz(x730, x717, x698);
-  { uint64_t x735 = cmovznz(x730, x714, x695);
-  { uint64_t x736 = cmovznz(x730, x711, x692);
+  { uint64_t x731 = cmovznz64(x730, x726, x707);
+  { uint64_t x732 = cmovznz64(x730, x723, x704);
+  { uint64_t x733 = cmovznz64(x730, x720, x701);
+  { uint64_t x734 = cmovznz64(x730, x717, x698);
+  { uint64_t x735 = cmovznz64(x730, x714, x695);
+  { uint64_t x736 = cmovznz64(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery64_2e369m25/femulDisplay.log b/src/Specific/montgomery64_2e369m25/femulDisplay.log
index 641de0a77..c0898b04c 100644
--- a/src/Specific/montgomery64_2e369m25/femulDisplay.log
+++ b/src/Specific/montgomery64_2e369m25/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint64_t x723, uint8_t x724 = subborrow_u64(x721, x704, 0xffffffffffffffffL);
  uint64_t x726, uint8_t x727 = subborrow_u64(x724, x707, 0x1ffffffffffff);
  uint64_t _, uint8_t x730 = subborrow_u64(x727, x709, 0x0);
- uint64_t x731 = cmovznz(x730, x726, x707);
- uint64_t x732 = cmovznz(x730, x723, x704);
- uint64_t x733 = cmovznz(x730, x720, x701);
- uint64_t x734 = cmovznz(x730, x717, x698);
- uint64_t x735 = cmovznz(x730, x714, x695);
- uint64_t x736 = cmovznz(x730, x711, x692);
+ uint64_t x731 = cmovznz64(x730, x726, x707);
+ uint64_t x732 = cmovznz64(x730, x723, x704);
+ uint64_t x733 = cmovznz64(x730, x720, x701);
+ uint64_t x734 = cmovznz64(x730, x717, x698);
+ uint64_t x735 = cmovznz64(x730, x714, x695);
+ uint64_t x736 = cmovznz64(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e369m25/feopp.c b/src/Specific/montgomery64_2e369m25/feopp.c
index c6fcdfc69..894e0aa8a 100644
--- a/src/Specific/montgomery64_2e369m25/feopp.c
+++ b/src/Specific/montgomery64_2e369m25/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xffffffffffffffe7L);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e369m25/feoppDisplay.log b/src/Specific/montgomery64_2e369m25/feoppDisplay.log
index ddfcbfb50..b026fa121 100644
--- a/src/Specific/montgomery64_2e369m25/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e369m25/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xffffffffffffffe7L);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e369m25/fesub.c b/src/Specific/montgomery64_2e369m25/fesub.c
index 9687d81d4..f1c7b6a7b 100644
--- a/src/Specific/montgomery64_2e369m25/fesub.c
+++ b/src/Specific/montgomery64_2e369m25/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xffffffffffffffe7L);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e369m25/fesubDisplay.log b/src/Specific/montgomery64_2e369m25/fesubDisplay.log
index 1f4cdbf1c..4b3eaa015 100644
--- a/src/Specific/montgomery64_2e369m25/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e369m25/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xffffffffffffffe7L);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e379m19/feadd.c b/src/Specific/montgomery64_2e379m19/feadd.c
index 8b05ac62c..cd9f98c5f 100644
--- a/src/Specific/montgomery64_2e379m19/feadd.c
+++ b/src/Specific/montgomery64_2e379m19/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0x7ffffffffffffff, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e379m19/feaddDisplay.log b/src/Specific/montgomery64_2e379m19/feaddDisplay.log
index 5efff7767..5c48f68c5 100644
--- a/src/Specific/montgomery64_2e379m19/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e379m19/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0x7ffffffffffffff);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e379m19/femul.c b/src/Specific/montgomery64_2e379m19/femul.c
index 8891798d8..cdf5ff0fc 100644
--- a/src/Specific/montgomery64_2e379m19/femul.c
+++ b/src/Specific/montgomery64_2e379m19/femul.c
@@ -250,12 +250,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x723; uint8_t x724 = _subborrow_u64(x721, x704, 0xffffffffffffffffL, &x723);
   { uint64_t x726; uint8_t x727 = _subborrow_u64(x724, x707, 0x7ffffffffffffff, &x726);
   { uint64_t _; uint8_t x730 = _subborrow_u64(x727, x709, 0x0, &_);
-  { uint64_t x731 = cmovznz(x730, x726, x707);
-  { uint64_t x732 = cmovznz(x730, x723, x704);
-  { uint64_t x733 = cmovznz(x730, x720, x701);
-  { uint64_t x734 = cmovznz(x730, x717, x698);
-  { uint64_t x735 = cmovznz(x730, x714, x695);
-  { uint64_t x736 = cmovznz(x730, x711, x692);
+  { uint64_t x731 = cmovznz64(x730, x726, x707);
+  { uint64_t x732 = cmovznz64(x730, x723, x704);
+  { uint64_t x733 = cmovznz64(x730, x720, x701);
+  { uint64_t x734 = cmovznz64(x730, x717, x698);
+  { uint64_t x735 = cmovznz64(x730, x714, x695);
+  { uint64_t x736 = cmovznz64(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery64_2e379m19/femulDisplay.log b/src/Specific/montgomery64_2e379m19/femulDisplay.log
index 54df5d5ec..5154ce6bd 100644
--- a/src/Specific/montgomery64_2e379m19/femulDisplay.log
+++ b/src/Specific/montgomery64_2e379m19/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint64_t x723, uint8_t x724 = subborrow_u64(x721, x704, 0xffffffffffffffffL);
  uint64_t x726, uint8_t x727 = subborrow_u64(x724, x707, 0x7ffffffffffffff);
  uint64_t _, uint8_t x730 = subborrow_u64(x727, x709, 0x0);
- uint64_t x731 = cmovznz(x730, x726, x707);
- uint64_t x732 = cmovznz(x730, x723, x704);
- uint64_t x733 = cmovznz(x730, x720, x701);
- uint64_t x734 = cmovznz(x730, x717, x698);
- uint64_t x735 = cmovznz(x730, x714, x695);
- uint64_t x736 = cmovznz(x730, x711, x692);
+ uint64_t x731 = cmovznz64(x730, x726, x707);
+ uint64_t x732 = cmovznz64(x730, x723, x704);
+ uint64_t x733 = cmovznz64(x730, x720, x701);
+ uint64_t x734 = cmovznz64(x730, x717, x698);
+ uint64_t x735 = cmovznz64(x730, x714, x695);
+ uint64_t x736 = cmovznz64(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e379m19/feopp.c b/src/Specific/montgomery64_2e379m19/feopp.c
index dc755a17b..27f51512a 100644
--- a/src/Specific/montgomery64_2e379m19/feopp.c
+++ b/src/Specific/montgomery64_2e379m19/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xffffffffffffffedL);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e379m19/feoppDisplay.log b/src/Specific/montgomery64_2e379m19/feoppDisplay.log
index a37cae7ef..cf97d003d 100644
--- a/src/Specific/montgomery64_2e379m19/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e379m19/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xffffffffffffffedL);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e379m19/fesub.c b/src/Specific/montgomery64_2e379m19/fesub.c
index e2fa7c05d..a3e301761 100644
--- a/src/Specific/montgomery64_2e379m19/fesub.c
+++ b/src/Specific/montgomery64_2e379m19/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xffffffffffffffedL);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e379m19/fesubDisplay.log b/src/Specific/montgomery64_2e379m19/fesubDisplay.log
index df203075d..c242d0109 100644
--- a/src/Specific/montgomery64_2e379m19/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e379m19/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xffffffffffffffedL);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e382m105/feadd.c b/src/Specific/montgomery64_2e382m105/feadd.c
index 634d11f6c..d153cc986 100644
--- a/src/Specific/montgomery64_2e382m105/feadd.c
+++ b/src/Specific/montgomery64_2e382m105/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0x3fffffffffffffff, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e382m105/feaddDisplay.log b/src/Specific/montgomery64_2e382m105/feaddDisplay.log
index 4b76fe1cf..ca32ff087 100644
--- a/src/Specific/montgomery64_2e382m105/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e382m105/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0x3fffffffffffffff);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e382m105/femul.c b/src/Specific/montgomery64_2e382m105/femul.c
index 27ccec503..c18796dcb 100644
--- a/src/Specific/montgomery64_2e382m105/femul.c
+++ b/src/Specific/montgomery64_2e382m105/femul.c
@@ -250,12 +250,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x723; uint8_t x724 = _subborrow_u64(x721, x704, 0xffffffffffffffffL, &x723);
   { uint64_t x726; uint8_t x727 = _subborrow_u64(x724, x707, 0x3fffffffffffffff, &x726);
   { uint64_t _; uint8_t x730 = _subborrow_u64(x727, x709, 0x0, &_);
-  { uint64_t x731 = cmovznz(x730, x726, x707);
-  { uint64_t x732 = cmovznz(x730, x723, x704);
-  { uint64_t x733 = cmovznz(x730, x720, x701);
-  { uint64_t x734 = cmovznz(x730, x717, x698);
-  { uint64_t x735 = cmovznz(x730, x714, x695);
-  { uint64_t x736 = cmovznz(x730, x711, x692);
+  { uint64_t x731 = cmovznz64(x730, x726, x707);
+  { uint64_t x732 = cmovznz64(x730, x723, x704);
+  { uint64_t x733 = cmovznz64(x730, x720, x701);
+  { uint64_t x734 = cmovznz64(x730, x717, x698);
+  { uint64_t x735 = cmovznz64(x730, x714, x695);
+  { uint64_t x736 = cmovznz64(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery64_2e382m105/femulDisplay.log b/src/Specific/montgomery64_2e382m105/femulDisplay.log
index a685ab7e3..473609891 100644
--- a/src/Specific/montgomery64_2e382m105/femulDisplay.log
+++ b/src/Specific/montgomery64_2e382m105/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint64_t x723, uint8_t x724 = subborrow_u64(x721, x704, 0xffffffffffffffffL);
  uint64_t x726, uint8_t x727 = subborrow_u64(x724, x707, 0x3fffffffffffffff);
  uint64_t _, uint8_t x730 = subborrow_u64(x727, x709, 0x0);
- uint64_t x731 = cmovznz(x730, x726, x707);
- uint64_t x732 = cmovznz(x730, x723, x704);
- uint64_t x733 = cmovznz(x730, x720, x701);
- uint64_t x734 = cmovznz(x730, x717, x698);
- uint64_t x735 = cmovznz(x730, x714, x695);
- uint64_t x736 = cmovznz(x730, x711, x692);
+ uint64_t x731 = cmovznz64(x730, x726, x707);
+ uint64_t x732 = cmovznz64(x730, x723, x704);
+ uint64_t x733 = cmovznz64(x730, x720, x701);
+ uint64_t x734 = cmovznz64(x730, x717, x698);
+ uint64_t x735 = cmovznz64(x730, x714, x695);
+ uint64_t x736 = cmovznz64(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e382m105/feopp.c b/src/Specific/montgomery64_2e382m105/feopp.c
index 135d1d97d..8c3f46737 100644
--- a/src/Specific/montgomery64_2e382m105/feopp.c
+++ b/src/Specific/montgomery64_2e382m105/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xffffffffffffff97L);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e382m105/feoppDisplay.log b/src/Specific/montgomery64_2e382m105/feoppDisplay.log
index bda4d719a..a9d8ca2d7 100644
--- a/src/Specific/montgomery64_2e382m105/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e382m105/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xffffffffffffff97L);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e382m105/fesub.c b/src/Specific/montgomery64_2e382m105/fesub.c
index 75b1e7459..d4902b9b9 100644
--- a/src/Specific/montgomery64_2e382m105/fesub.c
+++ b/src/Specific/montgomery64_2e382m105/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xffffffffffffff97L);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e382m105/fesubDisplay.log b/src/Specific/montgomery64_2e382m105/fesubDisplay.log
index 04e18ea34..9669d06c8 100644
--- a/src/Specific/montgomery64_2e382m105/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e382m105/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xffffffffffffff97L);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m187/feadd.c b/src/Specific/montgomery64_2e383m187/feadd.c
index 3e2f7aa4d..eced0e029 100644
--- a/src/Specific/montgomery64_2e383m187/feadd.c
+++ b/src/Specific/montgomery64_2e383m187/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0x7fffffffffffffffL, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e383m187/feaddDisplay.log b/src/Specific/montgomery64_2e383m187/feaddDisplay.log
index 6dbb79044..f29301fe6 100644
--- a/src/Specific/montgomery64_2e383m187/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e383m187/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e383m187/femul.c b/src/Specific/montgomery64_2e383m187/femul.c
index 81e5105da..9f87a6997 100644
--- a/src/Specific/montgomery64_2e383m187/femul.c
+++ b/src/Specific/montgomery64_2e383m187/femul.c
@@ -250,12 +250,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x723; uint8_t x724 = _subborrow_u64(x721, x704, 0xffffffffffffffffL, &x723);
   { uint64_t x726; uint8_t x727 = _subborrow_u64(x724, x707, 0x7fffffffffffffffL, &x726);
   { uint64_t _; uint8_t x730 = _subborrow_u64(x727, x709, 0x0, &_);
-  { uint64_t x731 = cmovznz(x730, x726, x707);
-  { uint64_t x732 = cmovznz(x730, x723, x704);
-  { uint64_t x733 = cmovznz(x730, x720, x701);
-  { uint64_t x734 = cmovznz(x730, x717, x698);
-  { uint64_t x735 = cmovznz(x730, x714, x695);
-  { uint64_t x736 = cmovznz(x730, x711, x692);
+  { uint64_t x731 = cmovznz64(x730, x726, x707);
+  { uint64_t x732 = cmovznz64(x730, x723, x704);
+  { uint64_t x733 = cmovznz64(x730, x720, x701);
+  { uint64_t x734 = cmovznz64(x730, x717, x698);
+  { uint64_t x735 = cmovznz64(x730, x714, x695);
+  { uint64_t x736 = cmovznz64(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery64_2e383m187/femulDisplay.log b/src/Specific/montgomery64_2e383m187/femulDisplay.log
index f9d630e11..9e36aea47 100644
--- a/src/Specific/montgomery64_2e383m187/femulDisplay.log
+++ b/src/Specific/montgomery64_2e383m187/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint64_t x723, uint8_t x724 = subborrow_u64(x721, x704, 0xffffffffffffffffL);
  uint64_t x726, uint8_t x727 = subborrow_u64(x724, x707, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x730 = subborrow_u64(x727, x709, 0x0);
- uint64_t x731 = cmovznz(x730, x726, x707);
- uint64_t x732 = cmovznz(x730, x723, x704);
- uint64_t x733 = cmovznz(x730, x720, x701);
- uint64_t x734 = cmovznz(x730, x717, x698);
- uint64_t x735 = cmovznz(x730, x714, x695);
- uint64_t x736 = cmovznz(x730, x711, x692);
+ uint64_t x731 = cmovznz64(x730, x726, x707);
+ uint64_t x732 = cmovznz64(x730, x723, x704);
+ uint64_t x733 = cmovznz64(x730, x720, x701);
+ uint64_t x734 = cmovznz64(x730, x717, x698);
+ uint64_t x735 = cmovznz64(x730, x714, x695);
+ uint64_t x736 = cmovznz64(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e383m187/feopp.c b/src/Specific/montgomery64_2e383m187/feopp.c
index b8588ce63..ee38728fa 100644
--- a/src/Specific/montgomery64_2e383m187/feopp.c
+++ b/src/Specific/montgomery64_2e383m187/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xffffffffffffff45L);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m187/feoppDisplay.log b/src/Specific/montgomery64_2e383m187/feoppDisplay.log
index 3e24a5627..89b5bb87b 100644
--- a/src/Specific/montgomery64_2e383m187/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e383m187/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xffffffffffffff45L);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m187/fesub.c b/src/Specific/montgomery64_2e383m187/fesub.c
index 719e0a26a..c92fe3d39 100644
--- a/src/Specific/montgomery64_2e383m187/fesub.c
+++ b/src/Specific/montgomery64_2e383m187/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xffffffffffffff45L);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m187/fesubDisplay.log b/src/Specific/montgomery64_2e383m187/fesubDisplay.log
index 65922af0a..08c1e5b26 100644
--- a/src/Specific/montgomery64_2e383m187/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e383m187/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xffffffffffffff45L);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m31/feadd.c b/src/Specific/montgomery64_2e383m31/feadd.c
index 7e35a49c6..5b393973b 100644
--- a/src/Specific/montgomery64_2e383m31/feadd.c
+++ b/src/Specific/montgomery64_2e383m31/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0x7fffffffffffffffL, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e383m31/feaddDisplay.log b/src/Specific/montgomery64_2e383m31/feaddDisplay.log
index 2f9da48ab..de4ad4faf 100644
--- a/src/Specific/montgomery64_2e383m31/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e383m31/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e383m31/femul.c b/src/Specific/montgomery64_2e383m31/femul.c
index 7e6f6b03a..04a4c08bd 100644
--- a/src/Specific/montgomery64_2e383m31/femul.c
+++ b/src/Specific/montgomery64_2e383m31/femul.c
@@ -250,12 +250,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x723; uint8_t x724 = _subborrow_u64(x721, x704, 0xffffffffffffffffL, &x723);
   { uint64_t x726; uint8_t x727 = _subborrow_u64(x724, x707, 0x7fffffffffffffffL, &x726);
   { uint64_t _; uint8_t x730 = _subborrow_u64(x727, x709, 0x0, &_);
-  { uint64_t x731 = cmovznz(x730, x726, x707);
-  { uint64_t x732 = cmovznz(x730, x723, x704);
-  { uint64_t x733 = cmovznz(x730, x720, x701);
-  { uint64_t x734 = cmovznz(x730, x717, x698);
-  { uint64_t x735 = cmovznz(x730, x714, x695);
-  { uint64_t x736 = cmovznz(x730, x711, x692);
+  { uint64_t x731 = cmovznz64(x730, x726, x707);
+  { uint64_t x732 = cmovznz64(x730, x723, x704);
+  { uint64_t x733 = cmovznz64(x730, x720, x701);
+  { uint64_t x734 = cmovznz64(x730, x717, x698);
+  { uint64_t x735 = cmovznz64(x730, x714, x695);
+  { uint64_t x736 = cmovznz64(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery64_2e383m31/femulDisplay.log b/src/Specific/montgomery64_2e383m31/femulDisplay.log
index d1f4ce4f5..73e05e2f9 100644
--- a/src/Specific/montgomery64_2e383m31/femulDisplay.log
+++ b/src/Specific/montgomery64_2e383m31/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint64_t x723, uint8_t x724 = subborrow_u64(x721, x704, 0xffffffffffffffffL);
  uint64_t x726, uint8_t x727 = subborrow_u64(x724, x707, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x730 = subborrow_u64(x727, x709, 0x0);
- uint64_t x731 = cmovznz(x730, x726, x707);
- uint64_t x732 = cmovznz(x730, x723, x704);
- uint64_t x733 = cmovznz(x730, x720, x701);
- uint64_t x734 = cmovznz(x730, x717, x698);
- uint64_t x735 = cmovznz(x730, x714, x695);
- uint64_t x736 = cmovznz(x730, x711, x692);
+ uint64_t x731 = cmovznz64(x730, x726, x707);
+ uint64_t x732 = cmovznz64(x730, x723, x704);
+ uint64_t x733 = cmovznz64(x730, x720, x701);
+ uint64_t x734 = cmovznz64(x730, x717, x698);
+ uint64_t x735 = cmovznz64(x730, x714, x695);
+ uint64_t x736 = cmovznz64(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e383m31/feopp.c b/src/Specific/montgomery64_2e383m31/feopp.c
index 6c2eff685..f5e2debdb 100644
--- a/src/Specific/montgomery64_2e383m31/feopp.c
+++ b/src/Specific/montgomery64_2e383m31/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xffffffffffffffe1L);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m31/feoppDisplay.log b/src/Specific/montgomery64_2e383m31/feoppDisplay.log
index b6121da1c..f906c81b3 100644
--- a/src/Specific/montgomery64_2e383m31/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e383m31/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xffffffffffffffe1L);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m31/fesub.c b/src/Specific/montgomery64_2e383m31/fesub.c
index 981f1909f..d759ffa5a 100644
--- a/src/Specific/montgomery64_2e383m31/fesub.c
+++ b/src/Specific/montgomery64_2e383m31/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xffffffffffffffe1L);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m31/fesubDisplay.log b/src/Specific/montgomery64_2e383m31/fesubDisplay.log
index 85bd5f95a..be101216c 100644
--- a/src/Specific/montgomery64_2e383m31/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e383m31/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xffffffffffffffe1L);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m421/feadd.c b/src/Specific/montgomery64_2e383m421/feadd.c
index 2f20efda6..244b4e633 100644
--- a/src/Specific/montgomery64_2e383m421/feadd.c
+++ b/src/Specific/montgomery64_2e383m421/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0x7fffffffffffffffL, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e383m421/feaddDisplay.log b/src/Specific/montgomery64_2e383m421/feaddDisplay.log
index 05cf644d8..4e71e5e9c 100644
--- a/src/Specific/montgomery64_2e383m421/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e383m421/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e383m421/femul.c b/src/Specific/montgomery64_2e383m421/femul.c
index 2b59a2b37..b8ab8b2c6 100644
--- a/src/Specific/montgomery64_2e383m421/femul.c
+++ b/src/Specific/montgomery64_2e383m421/femul.c
@@ -250,12 +250,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x723; uint8_t x724 = _subborrow_u64(x721, x704, 0xffffffffffffffffL, &x723);
   { uint64_t x726; uint8_t x727 = _subborrow_u64(x724, x707, 0x7fffffffffffffffL, &x726);
   { uint64_t _; uint8_t x730 = _subborrow_u64(x727, x709, 0x0, &_);
-  { uint64_t x731 = cmovznz(x730, x726, x707);
-  { uint64_t x732 = cmovznz(x730, x723, x704);
-  { uint64_t x733 = cmovznz(x730, x720, x701);
-  { uint64_t x734 = cmovznz(x730, x717, x698);
-  { uint64_t x735 = cmovznz(x730, x714, x695);
-  { uint64_t x736 = cmovznz(x730, x711, x692);
+  { uint64_t x731 = cmovznz64(x730, x726, x707);
+  { uint64_t x732 = cmovznz64(x730, x723, x704);
+  { uint64_t x733 = cmovznz64(x730, x720, x701);
+  { uint64_t x734 = cmovznz64(x730, x717, x698);
+  { uint64_t x735 = cmovznz64(x730, x714, x695);
+  { uint64_t x736 = cmovznz64(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery64_2e383m421/femulDisplay.log b/src/Specific/montgomery64_2e383m421/femulDisplay.log
index 26534e3aa..74ffddec5 100644
--- a/src/Specific/montgomery64_2e383m421/femulDisplay.log
+++ b/src/Specific/montgomery64_2e383m421/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint64_t x723, uint8_t x724 = subborrow_u64(x721, x704, 0xffffffffffffffffL);
  uint64_t x726, uint8_t x727 = subborrow_u64(x724, x707, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x730 = subborrow_u64(x727, x709, 0x0);
- uint64_t x731 = cmovznz(x730, x726, x707);
- uint64_t x732 = cmovznz(x730, x723, x704);
- uint64_t x733 = cmovznz(x730, x720, x701);
- uint64_t x734 = cmovznz(x730, x717, x698);
- uint64_t x735 = cmovznz(x730, x714, x695);
- uint64_t x736 = cmovznz(x730, x711, x692);
+ uint64_t x731 = cmovznz64(x730, x726, x707);
+ uint64_t x732 = cmovznz64(x730, x723, x704);
+ uint64_t x733 = cmovznz64(x730, x720, x701);
+ uint64_t x734 = cmovznz64(x730, x717, x698);
+ uint64_t x735 = cmovznz64(x730, x714, x695);
+ uint64_t x736 = cmovznz64(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e383m421/feopp.c b/src/Specific/montgomery64_2e383m421/feopp.c
index b0f48857d..0139d56bd 100644
--- a/src/Specific/montgomery64_2e383m421/feopp.c
+++ b/src/Specific/montgomery64_2e383m421/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xfffffffffffffe5bL);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m421/feoppDisplay.log b/src/Specific/montgomery64_2e383m421/feoppDisplay.log
index 71d47f147..53b451dbb 100644
--- a/src/Specific/montgomery64_2e383m421/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e383m421/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xfffffffffffffe5bL);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m421/fesub.c b/src/Specific/montgomery64_2e383m421/fesub.c
index f6b127ad9..6d05dc19e 100644
--- a/src/Specific/montgomery64_2e383m421/fesub.c
+++ b/src/Specific/montgomery64_2e383m421/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xfffffffffffffe5bL);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e383m421/fesubDisplay.log b/src/Specific/montgomery64_2e383m421/fesubDisplay.log
index cd8565d7d..f6d3bd616 100644
--- a/src/Specific/montgomery64_2e383m421/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e383m421/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xfffffffffffffe5bL);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feadd.c b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feadd.c
index ba863237a..ac69883a5 100644
--- a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feadd.c
+++ b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0xffffffffffffffffL, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feaddDisplay.log b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feaddDisplay.log
index ef940ce21..82253f65f 100644
--- a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0xffffffffffffffffL);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/femul.c b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/femul.c
index 8b9d2ea10..77fcb4861 100644
--- a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/femul.c
+++ b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/femul.c
@@ -250,12 +250,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x723; uint8_t x724 = _subborrow_u64(x721, x704, 0xffffffffffffffffL, &x723);
   { uint64_t x726; uint8_t x727 = _subborrow_u64(x724, x707, 0xffffffffffffffffL, &x726);
   { uint64_t _; uint8_t x730 = _subborrow_u64(x727, x709, 0x0, &_);
-  { uint64_t x731 = cmovznz(x730, x726, x707);
-  { uint64_t x732 = cmovznz(x730, x723, x704);
-  { uint64_t x733 = cmovznz(x730, x720, x701);
-  { uint64_t x734 = cmovznz(x730, x717, x698);
-  { uint64_t x735 = cmovznz(x730, x714, x695);
-  { uint64_t x736 = cmovznz(x730, x711, x692);
+  { uint64_t x731 = cmovznz64(x730, x726, x707);
+  { uint64_t x732 = cmovznz64(x730, x723, x704);
+  { uint64_t x733 = cmovznz64(x730, x720, x701);
+  { uint64_t x734 = cmovznz64(x730, x717, x698);
+  { uint64_t x735 = cmovznz64(x730, x714, x695);
+  { uint64_t x736 = cmovznz64(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/femulDisplay.log b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/femulDisplay.log
index 0b2e11f99..bda309185 100644
--- a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint64_t x723, uint8_t x724 = subborrow_u64(x721, x704, 0xffffffffffffffffL);
  uint64_t x726, uint8_t x727 = subborrow_u64(x724, x707, 0xffffffffffffffffL);
  uint64_t _, uint8_t x730 = subborrow_u64(x727, x709, 0x0);
- uint64_t x731 = cmovznz(x730, x726, x707);
- uint64_t x732 = cmovznz(x730, x723, x704);
- uint64_t x733 = cmovznz(x730, x720, x701);
- uint64_t x734 = cmovznz(x730, x717, x698);
- uint64_t x735 = cmovznz(x730, x714, x695);
- uint64_t x736 = cmovznz(x730, x711, x692);
+ uint64_t x731 = cmovznz64(x730, x726, x707);
+ uint64_t x732 = cmovznz64(x730, x723, x704);
+ uint64_t x733 = cmovznz64(x730, x720, x701);
+ uint64_t x734 = cmovznz64(x730, x717, x698);
+ uint64_t x735 = cmovznz64(x730, x714, x695);
+ uint64_t x736 = cmovznz64(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feopp.c b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feopp.c
index 8d4647b66..51a571f4d 100644
--- a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feopp.c
+++ b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xffffffff);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffff00000000L);
diff --git a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feoppDisplay.log b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feoppDisplay.log
index ca50925a0..ab3378641 100644
--- a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xffffffff);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffff00000000L);
diff --git a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/fesub.c b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/fesub.c
index f0e9bcdef..f14f24207 100644
--- a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/fesub.c
+++ b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xffffffff);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffff00000000L);
diff --git a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/fesubDisplay.log b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/fesubDisplay.log
index 52f8cdef4..63da9b2f5 100644
--- a/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e384m2e128m2e96p2e32m1/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xffffffff);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffff00000000L);
diff --git a/src/Specific/montgomery64_2e384m317/feadd.c b/src/Specific/montgomery64_2e384m317/feadd.c
index 72c3471ad..a73e2c353 100644
--- a/src/Specific/montgomery64_2e384m317/feadd.c
+++ b/src/Specific/montgomery64_2e384m317/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0xffffffffffffffffL, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e384m317/feaddDisplay.log b/src/Specific/montgomery64_2e384m317/feaddDisplay.log
index 6902245b7..fe11d57ba 100644
--- a/src/Specific/montgomery64_2e384m317/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e384m317/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0xffffffffffffffffL);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e384m317/femul.c b/src/Specific/montgomery64_2e384m317/femul.c
index d9c063dd5..ef9dec8be 100644
--- a/src/Specific/montgomery64_2e384m317/femul.c
+++ b/src/Specific/montgomery64_2e384m317/femul.c
@@ -250,12 +250,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x723; uint8_t x724 = _subborrow_u64(x721, x704, 0xffffffffffffffffL, &x723);
   { uint64_t x726; uint8_t x727 = _subborrow_u64(x724, x707, 0xffffffffffffffffL, &x726);
   { uint64_t _; uint8_t x730 = _subborrow_u64(x727, x709, 0x0, &_);
-  { uint64_t x731 = cmovznz(x730, x726, x707);
-  { uint64_t x732 = cmovznz(x730, x723, x704);
-  { uint64_t x733 = cmovznz(x730, x720, x701);
-  { uint64_t x734 = cmovznz(x730, x717, x698);
-  { uint64_t x735 = cmovznz(x730, x714, x695);
-  { uint64_t x736 = cmovznz(x730, x711, x692);
+  { uint64_t x731 = cmovznz64(x730, x726, x707);
+  { uint64_t x732 = cmovznz64(x730, x723, x704);
+  { uint64_t x733 = cmovznz64(x730, x720, x701);
+  { uint64_t x734 = cmovznz64(x730, x717, x698);
+  { uint64_t x735 = cmovznz64(x730, x714, x695);
+  { uint64_t x736 = cmovznz64(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery64_2e384m317/femulDisplay.log b/src/Specific/montgomery64_2e384m317/femulDisplay.log
index 0059aa1f0..eadcc1c62 100644
--- a/src/Specific/montgomery64_2e384m317/femulDisplay.log
+++ b/src/Specific/montgomery64_2e384m317/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint64_t x723, uint8_t x724 = subborrow_u64(x721, x704, 0xffffffffffffffffL);
  uint64_t x726, uint8_t x727 = subborrow_u64(x724, x707, 0xffffffffffffffffL);
  uint64_t _, uint8_t x730 = subborrow_u64(x727, x709, 0x0);
- uint64_t x731 = cmovznz(x730, x726, x707);
- uint64_t x732 = cmovznz(x730, x723, x704);
- uint64_t x733 = cmovznz(x730, x720, x701);
- uint64_t x734 = cmovznz(x730, x717, x698);
- uint64_t x735 = cmovznz(x730, x714, x695);
- uint64_t x736 = cmovznz(x730, x711, x692);
+ uint64_t x731 = cmovznz64(x730, x726, x707);
+ uint64_t x732 = cmovznz64(x730, x723, x704);
+ uint64_t x733 = cmovznz64(x730, x720, x701);
+ uint64_t x734 = cmovznz64(x730, x717, x698);
+ uint64_t x735 = cmovznz64(x730, x714, x695);
+ uint64_t x736 = cmovznz64(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e384m317/feopp.c b/src/Specific/montgomery64_2e384m317/feopp.c
index 62734643c..1e3821350 100644
--- a/src/Specific/montgomery64_2e384m317/feopp.c
+++ b/src/Specific/montgomery64_2e384m317/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xfffffffffffffec3L);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m317/feoppDisplay.log b/src/Specific/montgomery64_2e384m317/feoppDisplay.log
index a545383f0..096edacb8 100644
--- a/src/Specific/montgomery64_2e384m317/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e384m317/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xfffffffffffffec3L);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m317/fesub.c b/src/Specific/montgomery64_2e384m317/fesub.c
index fe7f61d05..600d8f46f 100644
--- a/src/Specific/montgomery64_2e384m317/fesub.c
+++ b/src/Specific/montgomery64_2e384m317/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xfffffffffffffec3L);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m317/fesubDisplay.log b/src/Specific/montgomery64_2e384m317/fesubDisplay.log
index 354c1c0c4..f66a7568e 100644
--- a/src/Specific/montgomery64_2e384m317/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e384m317/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xfffffffffffffec3L);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m5x2e368m1/feadd.c b/src/Specific/montgomery64_2e384m5x2e368m1/feadd.c
index 0b6b23394..f7bc3c4f8 100644
--- a/src/Specific/montgomery64_2e384m5x2e368m1/feadd.c
+++ b/src/Specific/montgomery64_2e384m5x2e368m1/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0xfffaffffffffffffL, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e384m5x2e368m1/feaddDisplay.log b/src/Specific/montgomery64_2e384m5x2e368m1/feaddDisplay.log
index 028f50b6f..222cf00b2 100644
--- a/src/Specific/montgomery64_2e384m5x2e368m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e384m5x2e368m1/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0xfffaffffffffffffL);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e384m5x2e368m1/femul.c b/src/Specific/montgomery64_2e384m5x2e368m1/femul.c
index 5b8229d0f..1df4cfe62 100644
--- a/src/Specific/montgomery64_2e384m5x2e368m1/femul.c
+++ b/src/Specific/montgomery64_2e384m5x2e368m1/femul.c
@@ -244,12 +244,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x705; uint8_t x706 = _subborrow_u64(x703, x686, 0xffffffffffffffffL, &x705);
   { uint64_t x708; uint8_t x709 = _subborrow_u64(x706, x689, 0xfffaffffffffffffL, &x708);
   { uint64_t _; uint8_t x712 = _subborrow_u64(x709, x691, 0x0, &_);
-  { uint64_t x713 = cmovznz(x712, x708, x689);
-  { uint64_t x714 = cmovznz(x712, x705, x686);
-  { uint64_t x715 = cmovznz(x712, x702, x683);
-  { uint64_t x716 = cmovznz(x712, x699, x680);
-  { uint64_t x717 = cmovznz(x712, x696, x677);
-  { uint64_t x718 = cmovznz(x712, x693, x674);
+  { uint64_t x713 = cmovznz64(x712, x708, x689);
+  { uint64_t x714 = cmovznz64(x712, x705, x686);
+  { uint64_t x715 = cmovznz64(x712, x702, x683);
+  { uint64_t x716 = cmovznz64(x712, x699, x680);
+  { uint64_t x717 = cmovznz64(x712, x696, x677);
+  { uint64_t x718 = cmovznz64(x712, x693, x674);
   out[0] = x718;
   out[1] = x717;
   out[2] = x716;
diff --git a/src/Specific/montgomery64_2e384m5x2e368m1/femulDisplay.log b/src/Specific/montgomery64_2e384m5x2e368m1/femulDisplay.log
index 2be36a676..1e07e0934 100644
--- a/src/Specific/montgomery64_2e384m5x2e368m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e384m5x2e368m1/femulDisplay.log
@@ -235,12 +235,12 @@ Interp-η
  uint64_t x705, uint8_t x706 = subborrow_u64(x703, x686, 0xffffffffffffffffL);
  uint64_t x708, uint8_t x709 = subborrow_u64(x706, x689, 0xfffaffffffffffffL);
  uint64_t _, uint8_t x712 = subborrow_u64(x709, x691, 0x0);
- uint64_t x713 = cmovznz(x712, x708, x689);
- uint64_t x714 = cmovznz(x712, x705, x686);
- uint64_t x715 = cmovznz(x712, x702, x683);
- uint64_t x716 = cmovznz(x712, x699, x680);
- uint64_t x717 = cmovznz(x712, x696, x677);
- uint64_t x718 = cmovznz(x712, x693, x674);
+ uint64_t x713 = cmovznz64(x712, x708, x689);
+ uint64_t x714 = cmovznz64(x712, x705, x686);
+ uint64_t x715 = cmovznz64(x712, x702, x683);
+ uint64_t x716 = cmovznz64(x712, x699, x680);
+ uint64_t x717 = cmovznz64(x712, x696, x677);
+ uint64_t x718 = cmovznz64(x712, x693, x674);
  return (x713, x714, x715, x716, x717, x718))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e384m5x2e368m1/feopp.c b/src/Specific/montgomery64_2e384m5x2e368m1/feopp.c
index b6bdcfdb8..666ec0ad1 100644
--- a/src/Specific/montgomery64_2e384m5x2e368m1/feopp.c
+++ b/src/Specific/montgomery64_2e384m5x2e368m1/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xffffffffffffffffL);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m5x2e368m1/feoppDisplay.log b/src/Specific/montgomery64_2e384m5x2e368m1/feoppDisplay.log
index d52548b04..625c3e169 100644
--- a/src/Specific/montgomery64_2e384m5x2e368m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e384m5x2e368m1/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xffffffffffffffffL);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m5x2e368m1/fesub.c b/src/Specific/montgomery64_2e384m5x2e368m1/fesub.c
index 5625e228f..8e5943404 100644
--- a/src/Specific/montgomery64_2e384m5x2e368m1/fesub.c
+++ b/src/Specific/montgomery64_2e384m5x2e368m1/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xffffffffffffffffL);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m5x2e368m1/fesubDisplay.log b/src/Specific/montgomery64_2e384m5x2e368m1/fesubDisplay.log
index 9871ee098..2787b77d5 100644
--- a/src/Specific/montgomery64_2e384m5x2e368m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e384m5x2e368m1/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xffffffffffffffffL);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m79x2e376m1/feadd.c b/src/Specific/montgomery64_2e384m79x2e376m1/feadd.c
index bb6d2bd92..1bc58a70d 100644
--- a/src/Specific/montgomery64_2e384m79x2e376m1/feadd.c
+++ b/src/Specific/montgomery64_2e384m79x2e376m1/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x55; uint8_t x56 = _subborrow_u64(x53, x37, 0xffffffffffffffffL, &x55);
   { uint64_t x58; uint8_t x59 = _subborrow_u64(x56, x40, 0xb0ffffffffffffffL, &x58);
   { uint64_t _; uint8_t x62 = _subborrow_u64(x59, x41, 0x0, &_);
-  { uint64_t x63 = cmovznz(x62, x58, x40);
-  { uint64_t x64 = cmovznz(x62, x55, x37);
-  { uint64_t x65 = cmovznz(x62, x52, x34);
-  { uint64_t x66 = cmovznz(x62, x49, x31);
-  { uint64_t x67 = cmovznz(x62, x46, x28);
-  { uint64_t x68 = cmovznz(x62, x43, x25);
+  { uint64_t x63 = cmovznz64(x62, x58, x40);
+  { uint64_t x64 = cmovznz64(x62, x55, x37);
+  { uint64_t x65 = cmovznz64(x62, x52, x34);
+  { uint64_t x66 = cmovznz64(x62, x49, x31);
+  { uint64_t x67 = cmovznz64(x62, x46, x28);
+  { uint64_t x68 = cmovznz64(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery64_2e384m79x2e376m1/feaddDisplay.log b/src/Specific/montgomery64_2e384m79x2e376m1/feaddDisplay.log
index 5e045cb78..d44abf137 100644
--- a/src/Specific/montgomery64_2e384m79x2e376m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e384m79x2e376m1/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint64_t x55, uint8_t x56 = subborrow_u64(x53, x37, 0xffffffffffffffffL);
  uint64_t x58, uint8_t x59 = subborrow_u64(x56, x40, 0xb0ffffffffffffffL);
  uint64_t _, uint8_t x62 = subborrow_u64(x59, x41, 0x0);
- uint64_t x63 = cmovznz(x62, x58, x40);
- uint64_t x64 = cmovznz(x62, x55, x37);
- uint64_t x65 = cmovznz(x62, x52, x34);
- uint64_t x66 = cmovznz(x62, x49, x31);
- uint64_t x67 = cmovznz(x62, x46, x28);
- uint64_t x68 = cmovznz(x62, x43, x25);
+ uint64_t x63 = cmovznz64(x62, x58, x40);
+ uint64_t x64 = cmovznz64(x62, x55, x37);
+ uint64_t x65 = cmovznz64(x62, x52, x34);
+ uint64_t x66 = cmovznz64(x62, x49, x31);
+ uint64_t x67 = cmovznz64(x62, x46, x28);
+ uint64_t x68 = cmovznz64(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e384m79x2e376m1/femul.c b/src/Specific/montgomery64_2e384m79x2e376m1/femul.c
index 6bf94c68b..65495b82a 100644
--- a/src/Specific/montgomery64_2e384m79x2e376m1/femul.c
+++ b/src/Specific/montgomery64_2e384m79x2e376m1/femul.c
@@ -244,12 +244,12 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x705; uint8_t x706 = _subborrow_u64(x703, x686, 0xffffffffffffffffL, &x705);
   { uint64_t x708; uint8_t x709 = _subborrow_u64(x706, x689, 0xb0ffffffffffffffL, &x708);
   { uint64_t _; uint8_t x712 = _subborrow_u64(x709, x691, 0x0, &_);
-  { uint64_t x713 = cmovznz(x712, x708, x689);
-  { uint64_t x714 = cmovznz(x712, x705, x686);
-  { uint64_t x715 = cmovznz(x712, x702, x683);
-  { uint64_t x716 = cmovznz(x712, x699, x680);
-  { uint64_t x717 = cmovznz(x712, x696, x677);
-  { uint64_t x718 = cmovznz(x712, x693, x674);
+  { uint64_t x713 = cmovznz64(x712, x708, x689);
+  { uint64_t x714 = cmovznz64(x712, x705, x686);
+  { uint64_t x715 = cmovznz64(x712, x702, x683);
+  { uint64_t x716 = cmovznz64(x712, x699, x680);
+  { uint64_t x717 = cmovznz64(x712, x696, x677);
+  { uint64_t x718 = cmovznz64(x712, x693, x674);
   out[0] = x718;
   out[1] = x717;
   out[2] = x716;
diff --git a/src/Specific/montgomery64_2e384m79x2e376m1/femulDisplay.log b/src/Specific/montgomery64_2e384m79x2e376m1/femulDisplay.log
index 49fddcbea..f6fad76a0 100644
--- a/src/Specific/montgomery64_2e384m79x2e376m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e384m79x2e376m1/femulDisplay.log
@@ -235,12 +235,12 @@ Interp-η
  uint64_t x705, uint8_t x706 = subborrow_u64(x703, x686, 0xffffffffffffffffL);
  uint64_t x708, uint8_t x709 = subborrow_u64(x706, x689, 0xb0ffffffffffffffL);
  uint64_t _, uint8_t x712 = subborrow_u64(x709, x691, 0x0);
- uint64_t x713 = cmovznz(x712, x708, x689);
- uint64_t x714 = cmovznz(x712, x705, x686);
- uint64_t x715 = cmovznz(x712, x702, x683);
- uint64_t x716 = cmovznz(x712, x699, x680);
- uint64_t x717 = cmovznz(x712, x696, x677);
- uint64_t x718 = cmovznz(x712, x693, x674);
+ uint64_t x713 = cmovznz64(x712, x708, x689);
+ uint64_t x714 = cmovznz64(x712, x705, x686);
+ uint64_t x715 = cmovznz64(x712, x702, x683);
+ uint64_t x716 = cmovznz64(x712, x699, x680);
+ uint64_t x717 = cmovznz64(x712, x696, x677);
+ uint64_t x718 = cmovznz64(x712, x693, x674);
  return (x713, x714, x715, x716, x717, x718))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e384m79x2e376m1/feopp.c b/src/Specific/montgomery64_2e384m79x2e376m1/feopp.c
index b09e3f333..1e2fad524 100644
--- a/src/Specific/montgomery64_2e384m79x2e376m1/feopp.c
+++ b/src/Specific/montgomery64_2e384m79x2e376m1/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21; uint8_t x22 = _subborrow_u64(x19, 0x0, x8, &x21);
   { uint64_t x24; uint8_t x25 = _subborrow_u64(x22, 0x0, x10, &x24);
   { uint64_t x27; uint8_t x28 = _subborrow_u64(x25, 0x0, x9, &x27);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xffffffffffffffffL);
   { uint64_t x32; uint8_t x33 = _addcarryx_u64(0x0, x12, x30, &x32);
   { uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m79x2e376m1/feoppDisplay.log b/src/Specific/montgomery64_2e384m79x2e376m1/feoppDisplay.log
index 5f6815128..72e96d79d 100644
--- a/src/Specific/montgomery64_2e384m79x2e376m1/feoppDisplay.log
+++ b/src/Specific/montgomery64_2e384m79x2e376m1/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = subborrow_u64(x19, 0x0, x8);
  uint64_t x24, uint8_t x25 = subborrow_u64(x22, 0x0, x10);
  uint64_t x27, uint8_t x28 = subborrow_u64(x25, 0x0, x9);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xffffffffffffffffL);
  uint64_t x32, uint8_t x33 = addcarryx_u64(0x0, x12, x30);
  uint64_t x34 = (x29 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m79x2e376m1/fesub.c b/src/Specific/montgomery64_2e384m79x2e376m1/fesub.c
index c26dcd466..4a8b7c7dd 100644
--- a/src/Specific/montgomery64_2e384m79x2e376m1/fesub.c
+++ b/src/Specific/montgomery64_2e384m79x2e376m1/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x34; uint8_t x35 = _subborrow_u64(x32, x11, x21, &x34);
   { uint64_t x37; uint8_t x38 = _subborrow_u64(x35, x13, x23, &x37);
   { uint64_t x40; uint8_t x41 = _subborrow_u64(x38, x12, x22, &x40);
-  { uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+  { uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
   { uint64_t x43 = (x42 & 0xffffffffffffffffL);
   { uint64_t x45; uint8_t x46 = _addcarryx_u64(0x0, x25, x43, &x45);
   { uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e384m79x2e376m1/fesubDisplay.log b/src/Specific/montgomery64_2e384m79x2e376m1/fesubDisplay.log
index c0a8a80bc..4d416958a 100644
--- a/src/Specific/montgomery64_2e384m79x2e376m1/fesubDisplay.log
+++ b/src/Specific/montgomery64_2e384m79x2e376m1/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x34, uint8_t x35 = subborrow_u64(x32, x11, x21);
  uint64_t x37, uint8_t x38 = subborrow_u64(x35, x13, x23);
  uint64_t x40, uint8_t x41 = subborrow_u64(x38, x12, x22);
- uint64_t x42 = (uint64_t)cmovznz(x41, 0x0, 0xffffffffffffffffL);
+ uint64_t x42 = cmovznz64(x41, 0x0, 0xffffffffffffffffL);
  uint64_t x43 = (x42 & 0xffffffffffffffffL);
  uint64_t x45, uint8_t x46 = addcarryx_u64(0x0, x25, x43);
  uint64_t x47 = (x42 & 0xffffffffffffffffL);
diff --git a/src/Specific/montgomery64_2e389m21/feadd.c b/src/Specific/montgomery64_2e389m21/feadd.c
index 23289045f..6e359760a 100644
--- a/src/Specific/montgomery64_2e389m21/feadd.c
+++ b/src/Specific/montgomery64_2e389m21/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint64_t out[7], const uint64_t in1[7], const uint64_t in2[7])
   { uint64_t x65; uint8_t x66 = _subborrow_u64(x63, x44, 0xffffffffffffffffL, &x65);
   { uint64_t x68; uint8_t x69 = _subborrow_u64(x66, x47, 0x1f, &x68);
   { uint64_t _; uint8_t x72 = _subborrow_u64(x69, x48, 0x0, &_);
-  { uint64_t x73 = cmovznz(x72, x68, x47);
-  { uint64_t x74 = cmovznz(x72, x65, x44);
-  { uint64_t x75 = cmovznz(x72, x62, x41);
-  { uint64_t x76 = cmovznz(x72, x59, x38);
-  { uint64_t x77 = cmovznz(x72, x56, x35);
-  { uint64_t x78 = cmovznz(x72, x53, x32);
-  { uint64_t x79 = cmovznz(x72, x50, x29);
+  { uint64_t x73 = cmovznz64(x72, x68, x47);
+  { uint64_t x74 = cmovznz64(x72, x65, x44);
+  { uint64_t x75 = cmovznz64(x72, x62, x41);
+  { uint64_t x76 = cmovznz64(x72, x59, x38);
+  { uint64_t x77 = cmovznz64(x72, x56, x35);
+  { uint64_t x78 = cmovznz64(x72, x53, x32);
+  { uint64_t x79 = cmovznz64(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery64_2e389m21/feaddDisplay.log b/src/Specific/montgomery64_2e389m21/feaddDisplay.log
index ab42051d0..cb7dd7090 100644
--- a/src/Specific/montgomery64_2e389m21/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e389m21/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint64_t x65, uint8_t x66 = subborrow_u64(x63, x44, 0xffffffffffffffffL);
  uint64_t x68, uint8_t x69 = subborrow_u64(x66, x47, 0x1f);
  uint64_t _, uint8_t x72 = subborrow_u64(x69, x48, 0x0);
- uint64_t x73 = cmovznz(x72, x68, x47);
- uint64_t x74 = cmovznz(x72, x65, x44);
- uint64_t x75 = cmovznz(x72, x62, x41);
- uint64_t x76 = cmovznz(x72, x59, x38);
- uint64_t x77 = cmovznz(x72, x56, x35);
- uint64_t x78 = cmovznz(x72, x53, x32);
- uint64_t x79 = cmovznz(x72, x50, x29);
+ uint64_t x73 = cmovznz64(x72, x68, x47);
+ uint64_t x74 = cmovznz64(x72, x65, x44);
+ uint64_t x75 = cmovznz64(x72, x62, x41);
+ uint64_t x76 = cmovznz64(x72, x59, x38);
+ uint64_t x77 = cmovznz64(x72, x56, x35);
+ uint64_t x78 = cmovznz64(x72, x53, x32);
+ uint64_t x79 = cmovznz64(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e401m31/feadd.c b/src/Specific/montgomery64_2e401m31/feadd.c
index aa164bbcb..01c0bc6b7 100644
--- a/src/Specific/montgomery64_2e401m31/feadd.c
+++ b/src/Specific/montgomery64_2e401m31/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint64_t out[7], const uint64_t in1[7], const uint64_t in2[7])
   { uint64_t x65; uint8_t x66 = _subborrow_u64(x63, x44, 0xffffffffffffffffL, &x65);
   { uint64_t x68; uint8_t x69 = _subborrow_u64(x66, x47, 0x1ffff, &x68);
   { uint64_t _; uint8_t x72 = _subborrow_u64(x69, x48, 0x0, &_);
-  { uint64_t x73 = cmovznz(x72, x68, x47);
-  { uint64_t x74 = cmovznz(x72, x65, x44);
-  { uint64_t x75 = cmovznz(x72, x62, x41);
-  { uint64_t x76 = cmovznz(x72, x59, x38);
-  { uint64_t x77 = cmovznz(x72, x56, x35);
-  { uint64_t x78 = cmovznz(x72, x53, x32);
-  { uint64_t x79 = cmovznz(x72, x50, x29);
+  { uint64_t x73 = cmovznz64(x72, x68, x47);
+  { uint64_t x74 = cmovznz64(x72, x65, x44);
+  { uint64_t x75 = cmovznz64(x72, x62, x41);
+  { uint64_t x76 = cmovznz64(x72, x59, x38);
+  { uint64_t x77 = cmovznz64(x72, x56, x35);
+  { uint64_t x78 = cmovznz64(x72, x53, x32);
+  { uint64_t x79 = cmovznz64(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery64_2e401m31/feaddDisplay.log b/src/Specific/montgomery64_2e401m31/feaddDisplay.log
index 31c15d9d2..9bffb37fb 100644
--- a/src/Specific/montgomery64_2e401m31/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e401m31/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint64_t x65, uint8_t x66 = subborrow_u64(x63, x44, 0xffffffffffffffffL);
  uint64_t x68, uint8_t x69 = subborrow_u64(x66, x47, 0x1ffff);
  uint64_t _, uint8_t x72 = subborrow_u64(x69, x48, 0x0);
- uint64_t x73 = cmovznz(x72, x68, x47);
- uint64_t x74 = cmovznz(x72, x65, x44);
- uint64_t x75 = cmovznz(x72, x62, x41);
- uint64_t x76 = cmovznz(x72, x59, x38);
- uint64_t x77 = cmovznz(x72, x56, x35);
- uint64_t x78 = cmovznz(x72, x53, x32);
- uint64_t x79 = cmovznz(x72, x50, x29);
+ uint64_t x73 = cmovznz64(x72, x68, x47);
+ uint64_t x74 = cmovznz64(x72, x65, x44);
+ uint64_t x75 = cmovznz64(x72, x62, x41);
+ uint64_t x76 = cmovznz64(x72, x59, x38);
+ uint64_t x77 = cmovznz64(x72, x56, x35);
+ uint64_t x78 = cmovznz64(x72, x53, x32);
+ uint64_t x79 = cmovznz64(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e413m21/feadd.c b/src/Specific/montgomery64_2e413m21/feadd.c
index 04bef7398..1978027e3 100644
--- a/src/Specific/montgomery64_2e413m21/feadd.c
+++ b/src/Specific/montgomery64_2e413m21/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint64_t out[7], const uint64_t in1[7], const uint64_t in2[7])
   { uint64_t x65; uint8_t x66 = _subborrow_u64(x63, x44, 0xffffffffffffffffL, &x65);
   { uint64_t x68; uint8_t x69 = _subborrow_u64(x66, x47, 0x1fffffff, &x68);
   { uint64_t _; uint8_t x72 = _subborrow_u64(x69, x48, 0x0, &_);
-  { uint64_t x73 = cmovznz(x72, x68, x47);
-  { uint64_t x74 = cmovznz(x72, x65, x44);
-  { uint64_t x75 = cmovznz(x72, x62, x41);
-  { uint64_t x76 = cmovznz(x72, x59, x38);
-  { uint64_t x77 = cmovznz(x72, x56, x35);
-  { uint64_t x78 = cmovznz(x72, x53, x32);
-  { uint64_t x79 = cmovznz(x72, x50, x29);
+  { uint64_t x73 = cmovznz64(x72, x68, x47);
+  { uint64_t x74 = cmovznz64(x72, x65, x44);
+  { uint64_t x75 = cmovznz64(x72, x62, x41);
+  { uint64_t x76 = cmovznz64(x72, x59, x38);
+  { uint64_t x77 = cmovznz64(x72, x56, x35);
+  { uint64_t x78 = cmovznz64(x72, x53, x32);
+  { uint64_t x79 = cmovznz64(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery64_2e413m21/feaddDisplay.log b/src/Specific/montgomery64_2e413m21/feaddDisplay.log
index 85be5f860..0e539add9 100644
--- a/src/Specific/montgomery64_2e413m21/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e413m21/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint64_t x65, uint8_t x66 = subborrow_u64(x63, x44, 0xffffffffffffffffL);
  uint64_t x68, uint8_t x69 = subborrow_u64(x66, x47, 0x1fffffff);
  uint64_t _, uint8_t x72 = subborrow_u64(x69, x48, 0x0);
- uint64_t x73 = cmovznz(x72, x68, x47);
- uint64_t x74 = cmovznz(x72, x65, x44);
- uint64_t x75 = cmovznz(x72, x62, x41);
- uint64_t x76 = cmovznz(x72, x59, x38);
- uint64_t x77 = cmovznz(x72, x56, x35);
- uint64_t x78 = cmovznz(x72, x53, x32);
- uint64_t x79 = cmovznz(x72, x50, x29);
+ uint64_t x73 = cmovznz64(x72, x68, x47);
+ uint64_t x74 = cmovznz64(x72, x65, x44);
+ uint64_t x75 = cmovznz64(x72, x62, x41);
+ uint64_t x76 = cmovznz64(x72, x59, x38);
+ uint64_t x77 = cmovznz64(x72, x56, x35);
+ uint64_t x78 = cmovznz64(x72, x53, x32);
+ uint64_t x79 = cmovznz64(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e414m17/feadd.c b/src/Specific/montgomery64_2e414m17/feadd.c
index db9bba1e3..ec76fd473 100644
--- a/src/Specific/montgomery64_2e414m17/feadd.c
+++ b/src/Specific/montgomery64_2e414m17/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint64_t out[7], const uint64_t in1[7], const uint64_t in2[7])
   { uint64_t x65; uint8_t x66 = _subborrow_u64(x63, x44, 0xffffffffffffffffL, &x65);
   { uint64_t x68; uint8_t x69 = _subborrow_u64(x66, x47, 0x3fffffff, &x68);
   { uint64_t _; uint8_t x72 = _subborrow_u64(x69, x48, 0x0, &_);
-  { uint64_t x73 = cmovznz(x72, x68, x47);
-  { uint64_t x74 = cmovznz(x72, x65, x44);
-  { uint64_t x75 = cmovznz(x72, x62, x41);
-  { uint64_t x76 = cmovznz(x72, x59, x38);
-  { uint64_t x77 = cmovznz(x72, x56, x35);
-  { uint64_t x78 = cmovznz(x72, x53, x32);
-  { uint64_t x79 = cmovznz(x72, x50, x29);
+  { uint64_t x73 = cmovznz64(x72, x68, x47);
+  { uint64_t x74 = cmovznz64(x72, x65, x44);
+  { uint64_t x75 = cmovznz64(x72, x62, x41);
+  { uint64_t x76 = cmovznz64(x72, x59, x38);
+  { uint64_t x77 = cmovznz64(x72, x56, x35);
+  { uint64_t x78 = cmovznz64(x72, x53, x32);
+  { uint64_t x79 = cmovznz64(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery64_2e414m17/feaddDisplay.log b/src/Specific/montgomery64_2e414m17/feaddDisplay.log
index 693e4644b..d7510c664 100644
--- a/src/Specific/montgomery64_2e414m17/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e414m17/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint64_t x65, uint8_t x66 = subborrow_u64(x63, x44, 0xffffffffffffffffL);
  uint64_t x68, uint8_t x69 = subborrow_u64(x66, x47, 0x3fffffff);
  uint64_t _, uint8_t x72 = subborrow_u64(x69, x48, 0x0);
- uint64_t x73 = cmovznz(x72, x68, x47);
- uint64_t x74 = cmovznz(x72, x65, x44);
- uint64_t x75 = cmovznz(x72, x62, x41);
- uint64_t x76 = cmovznz(x72, x59, x38);
- uint64_t x77 = cmovznz(x72, x56, x35);
- uint64_t x78 = cmovznz(x72, x53, x32);
- uint64_t x79 = cmovznz(x72, x50, x29);
+ uint64_t x73 = cmovznz64(x72, x68, x47);
+ uint64_t x74 = cmovznz64(x72, x65, x44);
+ uint64_t x75 = cmovznz64(x72, x62, x41);
+ uint64_t x76 = cmovznz64(x72, x59, x38);
+ uint64_t x77 = cmovznz64(x72, x56, x35);
+ uint64_t x78 = cmovznz64(x72, x53, x32);
+ uint64_t x79 = cmovznz64(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e416m2e208m1/feadd.c b/src/Specific/montgomery64_2e416m2e208m1/feadd.c
index 5879fad2e..753e03d78 100644
--- a/src/Specific/montgomery64_2e416m2e208m1/feadd.c
+++ b/src/Specific/montgomery64_2e416m2e208m1/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint64_t out[7], const uint64_t in1[7], const uint64_t in2[7])
   { uint64_t x65; uint8_t x66 = _subborrow_u64(x63, x44, 0xffffffffffffffffL, &x65);
   { uint64_t x68; uint8_t x69 = _subborrow_u64(x66, x47, 0xffffffff, &x68);
   { uint64_t _; uint8_t x72 = _subborrow_u64(x69, x48, 0x0, &_);
-  { uint64_t x73 = cmovznz(x72, x68, x47);
-  { uint64_t x74 = cmovznz(x72, x65, x44);
-  { uint64_t x75 = cmovznz(x72, x62, x41);
-  { uint64_t x76 = cmovznz(x72, x59, x38);
-  { uint64_t x77 = cmovznz(x72, x56, x35);
-  { uint64_t x78 = cmovznz(x72, x53, x32);
-  { uint64_t x79 = cmovznz(x72, x50, x29);
+  { uint64_t x73 = cmovznz64(x72, x68, x47);
+  { uint64_t x74 = cmovznz64(x72, x65, x44);
+  { uint64_t x75 = cmovznz64(x72, x62, x41);
+  { uint64_t x76 = cmovznz64(x72, x59, x38);
+  { uint64_t x77 = cmovznz64(x72, x56, x35);
+  { uint64_t x78 = cmovznz64(x72, x53, x32);
+  { uint64_t x79 = cmovznz64(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery64_2e416m2e208m1/feaddDisplay.log b/src/Specific/montgomery64_2e416m2e208m1/feaddDisplay.log
index d8202eb2d..bdac118e2 100644
--- a/src/Specific/montgomery64_2e416m2e208m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e416m2e208m1/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint64_t x65, uint8_t x66 = subborrow_u64(x63, x44, 0xffffffffffffffffL);
  uint64_t x68, uint8_t x69 = subborrow_u64(x66, x47, 0xffffffff);
  uint64_t _, uint8_t x72 = subborrow_u64(x69, x48, 0x0);
- uint64_t x73 = cmovznz(x72, x68, x47);
- uint64_t x74 = cmovznz(x72, x65, x44);
- uint64_t x75 = cmovznz(x72, x62, x41);
- uint64_t x76 = cmovznz(x72, x59, x38);
- uint64_t x77 = cmovznz(x72, x56, x35);
- uint64_t x78 = cmovznz(x72, x53, x32);
- uint64_t x79 = cmovznz(x72, x50, x29);
+ uint64_t x73 = cmovznz64(x72, x68, x47);
+ uint64_t x74 = cmovznz64(x72, x65, x44);
+ uint64_t x75 = cmovznz64(x72, x62, x41);
+ uint64_t x76 = cmovznz64(x72, x59, x38);
+ uint64_t x77 = cmovznz64(x72, x56, x35);
+ uint64_t x78 = cmovznz64(x72, x53, x32);
+ uint64_t x79 = cmovznz64(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e444m17/feadd.c b/src/Specific/montgomery64_2e444m17/feadd.c
index f3512f48f..653b42fdf 100644
--- a/src/Specific/montgomery64_2e444m17/feadd.c
+++ b/src/Specific/montgomery64_2e444m17/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint64_t out[7], const uint64_t in1[7], const uint64_t in2[7])
   { uint64_t x65; uint8_t x66 = _subborrow_u64(x63, x44, 0xffffffffffffffffL, &x65);
   { uint64_t x68; uint8_t x69 = _subborrow_u64(x66, x47, 0xfffffffffffffff, &x68);
   { uint64_t _; uint8_t x72 = _subborrow_u64(x69, x48, 0x0, &_);
-  { uint64_t x73 = cmovznz(x72, x68, x47);
-  { uint64_t x74 = cmovznz(x72, x65, x44);
-  { uint64_t x75 = cmovznz(x72, x62, x41);
-  { uint64_t x76 = cmovznz(x72, x59, x38);
-  { uint64_t x77 = cmovznz(x72, x56, x35);
-  { uint64_t x78 = cmovznz(x72, x53, x32);
-  { uint64_t x79 = cmovznz(x72, x50, x29);
+  { uint64_t x73 = cmovznz64(x72, x68, x47);
+  { uint64_t x74 = cmovznz64(x72, x65, x44);
+  { uint64_t x75 = cmovznz64(x72, x62, x41);
+  { uint64_t x76 = cmovznz64(x72, x59, x38);
+  { uint64_t x77 = cmovznz64(x72, x56, x35);
+  { uint64_t x78 = cmovznz64(x72, x53, x32);
+  { uint64_t x79 = cmovznz64(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery64_2e444m17/feaddDisplay.log b/src/Specific/montgomery64_2e444m17/feaddDisplay.log
index 07c77fb40..2a33a4262 100644
--- a/src/Specific/montgomery64_2e444m17/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e444m17/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint64_t x65, uint8_t x66 = subborrow_u64(x63, x44, 0xffffffffffffffffL);
  uint64_t x68, uint8_t x69 = subborrow_u64(x66, x47, 0xfffffffffffffff);
  uint64_t _, uint8_t x72 = subborrow_u64(x69, x48, 0x0);
- uint64_t x73 = cmovznz(x72, x68, x47);
- uint64_t x74 = cmovznz(x72, x65, x44);
- uint64_t x75 = cmovznz(x72, x62, x41);
- uint64_t x76 = cmovznz(x72, x59, x38);
- uint64_t x77 = cmovznz(x72, x56, x35);
- uint64_t x78 = cmovznz(x72, x53, x32);
- uint64_t x79 = cmovznz(x72, x50, x29);
+ uint64_t x73 = cmovznz64(x72, x68, x47);
+ uint64_t x74 = cmovznz64(x72, x65, x44);
+ uint64_t x75 = cmovznz64(x72, x62, x41);
+ uint64_t x76 = cmovznz64(x72, x59, x38);
+ uint64_t x77 = cmovznz64(x72, x56, x35);
+ uint64_t x78 = cmovznz64(x72, x53, x32);
+ uint64_t x79 = cmovznz64(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e448m2e224m1/feadd.c b/src/Specific/montgomery64_2e448m2e224m1/feadd.c
index 533db1963..07baa6ebd 100644
--- a/src/Specific/montgomery64_2e448m2e224m1/feadd.c
+++ b/src/Specific/montgomery64_2e448m2e224m1/feadd.c
@@ -28,13 +28,13 @@ static void feadd(uint64_t out[7], const uint64_t in1[7], const uint64_t in2[7])
   { uint64_t x65; uint8_t x66 = _subborrow_u64(x63, x44, 0xffffffffffffffffL, &x65);
   { uint64_t x68; uint8_t x69 = _subborrow_u64(x66, x47, 0xffffffffffffffffL, &x68);
   { uint64_t _; uint8_t x72 = _subborrow_u64(x69, x48, 0x0, &_);
-  { uint64_t x73 = cmovznz(x72, x68, x47);
-  { uint64_t x74 = cmovznz(x72, x65, x44);
-  { uint64_t x75 = cmovznz(x72, x62, x41);
-  { uint64_t x76 = cmovznz(x72, x59, x38);
-  { uint64_t x77 = cmovznz(x72, x56, x35);
-  { uint64_t x78 = cmovznz(x72, x53, x32);
-  { uint64_t x79 = cmovznz(x72, x50, x29);
+  { uint64_t x73 = cmovznz64(x72, x68, x47);
+  { uint64_t x74 = cmovznz64(x72, x65, x44);
+  { uint64_t x75 = cmovznz64(x72, x62, x41);
+  { uint64_t x76 = cmovznz64(x72, x59, x38);
+  { uint64_t x77 = cmovznz64(x72, x56, x35);
+  { uint64_t x78 = cmovznz64(x72, x53, x32);
+  { uint64_t x79 = cmovznz64(x72, x50, x29);
   out[0] = x79;
   out[1] = x78;
   out[2] = x77;
diff --git a/src/Specific/montgomery64_2e448m2e224m1/feaddDisplay.log b/src/Specific/montgomery64_2e448m2e224m1/feaddDisplay.log
index 566d9f75c..43bb533e8 100644
--- a/src/Specific/montgomery64_2e448m2e224m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e448m2e224m1/feaddDisplay.log
@@ -17,13 +17,13 @@ Interp-η
  uint64_t x65, uint8_t x66 = subborrow_u64(x63, x44, 0xffffffffffffffffL);
  uint64_t x68, uint8_t x69 = subborrow_u64(x66, x47, 0xffffffffffffffffL);
  uint64_t _, uint8_t x72 = subborrow_u64(x69, x48, 0x0);
- uint64_t x73 = cmovznz(x72, x68, x47);
- uint64_t x74 = cmovznz(x72, x65, x44);
- uint64_t x75 = cmovznz(x72, x62, x41);
- uint64_t x76 = cmovznz(x72, x59, x38);
- uint64_t x77 = cmovznz(x72, x56, x35);
- uint64_t x78 = cmovznz(x72, x53, x32);
- uint64_t x79 = cmovznz(x72, x50, x29);
+ uint64_t x73 = cmovznz64(x72, x68, x47);
+ uint64_t x74 = cmovznz64(x72, x65, x44);
+ uint64_t x75 = cmovznz64(x72, x62, x41);
+ uint64_t x76 = cmovznz64(x72, x59, x38);
+ uint64_t x77 = cmovznz64(x72, x56, x35);
+ uint64_t x78 = cmovznz64(x72, x53, x32);
+ uint64_t x79 = cmovznz64(x72, x50, x29);
  return (x73, x74, x75, x76, x77, x78, x79))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e450m2e225m1/feadd.c b/src/Specific/montgomery64_2e450m2e225m1/feadd.c
index 6a47c0239..a7e273342 100644
--- a/src/Specific/montgomery64_2e450m2e225m1/feadd.c
+++ b/src/Specific/montgomery64_2e450m2e225m1/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0x3, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e450m2e225m1/feaddDisplay.log b/src/Specific/montgomery64_2e450m2e225m1/feaddDisplay.log
index 7f8f7d912..ceb4ce79a 100644
--- a/src/Specific/montgomery64_2e450m2e225m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e450m2e225m1/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0x3);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e452m3/feadd.c b/src/Specific/montgomery64_2e452m3/feadd.c
index a6c7b9cf8..752d18f97 100644
--- a/src/Specific/montgomery64_2e452m3/feadd.c
+++ b/src/Specific/montgomery64_2e452m3/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0xf, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e452m3/feaddDisplay.log b/src/Specific/montgomery64_2e452m3/feaddDisplay.log
index 891912d50..9bbb41025 100644
--- a/src/Specific/montgomery64_2e452m3/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e452m3/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0xf);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e468m17/feadd.c b/src/Specific/montgomery64_2e468m17/feadd.c
index 2019e4f52..ae087338f 100644
--- a/src/Specific/montgomery64_2e468m17/feadd.c
+++ b/src/Specific/montgomery64_2e468m17/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0xfffff, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e468m17/feaddDisplay.log b/src/Specific/montgomery64_2e468m17/feaddDisplay.log
index 539e92b3c..73a489014 100644
--- a/src/Specific/montgomery64_2e468m17/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e468m17/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0xfffff);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e480m2e240m1/feadd.c b/src/Specific/montgomery64_2e480m2e240m1/feadd.c
index c957fc638..17d80401d 100644
--- a/src/Specific/montgomery64_2e480m2e240m1/feadd.c
+++ b/src/Specific/montgomery64_2e480m2e240m1/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0xffffffff, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e480m2e240m1/feaddDisplay.log b/src/Specific/montgomery64_2e480m2e240m1/feaddDisplay.log
index 2d14dff39..6a0ac8802 100644
--- a/src/Specific/montgomery64_2e480m2e240m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e480m2e240m1/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0xffffffff);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e488m17/feadd.c b/src/Specific/montgomery64_2e488m17/feadd.c
index 1e923a46c..d51bc767a 100644
--- a/src/Specific/montgomery64_2e488m17/feadd.c
+++ b/src/Specific/montgomery64_2e488m17/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0xffffffffff, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e488m17/feaddDisplay.log b/src/Specific/montgomery64_2e488m17/feaddDisplay.log
index e4e837f7a..e75c10f26 100644
--- a/src/Specific/montgomery64_2e488m17/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e488m17/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0xffffffffff);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e489m21/feadd.c b/src/Specific/montgomery64_2e489m21/feadd.c
index 75c56a2e8..e416cbae4 100644
--- a/src/Specific/montgomery64_2e489m21/feadd.c
+++ b/src/Specific/montgomery64_2e489m21/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0x1ffffffffff, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e489m21/feaddDisplay.log b/src/Specific/montgomery64_2e489m21/feaddDisplay.log
index 474a7d1d2..f8639d889 100644
--- a/src/Specific/montgomery64_2e489m21/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e489m21/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0x1ffffffffff);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e495m31/feadd.c b/src/Specific/montgomery64_2e495m31/feadd.c
index 4e490612f..f0c78d0f9 100644
--- a/src/Specific/montgomery64_2e495m31/feadd.c
+++ b/src/Specific/montgomery64_2e495m31/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0x7fffffffffff, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e495m31/feaddDisplay.log b/src/Specific/montgomery64_2e495m31/feaddDisplay.log
index 924aa6e75..41e6d4e3a 100644
--- a/src/Specific/montgomery64_2e495m31/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e495m31/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0x7fffffffffff);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e510m290x2e496m1/feadd.c b/src/Specific/montgomery64_2e510m290x2e496m1/feadd.c
index 77643d534..9851fdab2 100644
--- a/src/Specific/montgomery64_2e510m290x2e496m1/feadd.c
+++ b/src/Specific/montgomery64_2e510m290x2e496m1/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0x3eddffffffffffff, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e510m290x2e496m1/feaddDisplay.log b/src/Specific/montgomery64_2e510m290x2e496m1/feaddDisplay.log
index 78a9aa96e..57c9fad62 100644
--- a/src/Specific/montgomery64_2e510m290x2e496m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e510m290x2e496m1/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0x3eddffffffffffff);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e511m187/feadd.c b/src/Specific/montgomery64_2e511m187/feadd.c
index bcd426285..ef4b7bc6d 100644
--- a/src/Specific/montgomery64_2e511m187/feadd.c
+++ b/src/Specific/montgomery64_2e511m187/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0x7fffffffffffffffL, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e511m187/feaddDisplay.log b/src/Specific/montgomery64_2e511m187/feaddDisplay.log
index c2bfe9410..88beaff82 100644
--- a/src/Specific/montgomery64_2e511m187/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e511m187/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e511m481/feadd.c b/src/Specific/montgomery64_2e511m481/feadd.c
index 09df91754..b1a70e025 100644
--- a/src/Specific/montgomery64_2e511m481/feadd.c
+++ b/src/Specific/montgomery64_2e511m481/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0x7fffffffffffffffL, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e511m481/feaddDisplay.log b/src/Specific/montgomery64_2e511m481/feaddDisplay.log
index 5702bef05..3102464cf 100644
--- a/src/Specific/montgomery64_2e511m481/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e511m481/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0x7fffffffffffffffL);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e512m491x2e496m1/feadd.c b/src/Specific/montgomery64_2e512m491x2e496m1/feadd.c
index 3f10ced2e..cf7695d2d 100644
--- a/src/Specific/montgomery64_2e512m491x2e496m1/feadd.c
+++ b/src/Specific/montgomery64_2e512m491x2e496m1/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0xfe14ffffffffffffL, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e512m491x2e496m1/feaddDisplay.log b/src/Specific/montgomery64_2e512m491x2e496m1/feaddDisplay.log
index a0d188d16..d9e775eee 100644
--- a/src/Specific/montgomery64_2e512m491x2e496m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e512m491x2e496m1/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0xfe14ffffffffffffL);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e512m569/feadd.c b/src/Specific/montgomery64_2e512m569/feadd.c
index 3dd38b658..5ef15f5f9 100644
--- a/src/Specific/montgomery64_2e512m569/feadd.c
+++ b/src/Specific/montgomery64_2e512m569/feadd.c
@@ -32,14 +32,14 @@ static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8])
   { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
   { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0xffffffffffffffffL, &x78);
   { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-  { uint64_t x83 = cmovznz(x82, x78, x54);
-  { uint64_t x84 = cmovznz(x82, x75, x51);
-  { uint64_t x85 = cmovznz(x82, x72, x48);
-  { uint64_t x86 = cmovznz(x82, x69, x45);
-  { uint64_t x87 = cmovznz(x82, x66, x42);
-  { uint64_t x88 = cmovznz(x82, x63, x39);
-  { uint64_t x89 = cmovznz(x82, x60, x36);
-  { uint64_t x90 = cmovznz(x82, x57, x33);
+  { uint64_t x83 = cmovznz64(x82, x78, x54);
+  { uint64_t x84 = cmovznz64(x82, x75, x51);
+  { uint64_t x85 = cmovznz64(x82, x72, x48);
+  { uint64_t x86 = cmovznz64(x82, x69, x45);
+  { uint64_t x87 = cmovznz64(x82, x66, x42);
+  { uint64_t x88 = cmovznz64(x82, x63, x39);
+  { uint64_t x89 = cmovznz64(x82, x60, x36);
+  { uint64_t x90 = cmovznz64(x82, x57, x33);
   out[0] = x90;
   out[1] = x89;
   out[2] = x88;
diff --git a/src/Specific/montgomery64_2e512m569/feaddDisplay.log b/src/Specific/montgomery64_2e512m569/feaddDisplay.log
index 35aacd709..75c6272df 100644
--- a/src/Specific/montgomery64_2e512m569/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e512m569/feaddDisplay.log
@@ -19,14 +19,14 @@ Interp-η
  uint64_t x75, uint8_t x76 = subborrow_u64(x73, x51, 0xffffffffffffffffL);
  uint64_t x78, uint8_t x79 = subborrow_u64(x76, x54, 0xffffffffffffffffL);
  uint64_t _, uint8_t x82 = subborrow_u64(x79, x55, 0x0);
- uint64_t x83 = cmovznz(x82, x78, x54);
- uint64_t x84 = cmovznz(x82, x75, x51);
- uint64_t x85 = cmovznz(x82, x72, x48);
- uint64_t x86 = cmovznz(x82, x69, x45);
- uint64_t x87 = cmovznz(x82, x66, x42);
- uint64_t x88 = cmovznz(x82, x63, x39);
- uint64_t x89 = cmovznz(x82, x60, x36);
- uint64_t x90 = cmovznz(x82, x57, x33);
+ uint64_t x83 = cmovznz64(x82, x78, x54);
+ uint64_t x84 = cmovznz64(x82, x75, x51);
+ uint64_t x85 = cmovznz64(x82, x72, x48);
+ uint64_t x86 = cmovznz64(x82, x69, x45);
+ uint64_t x87 = cmovznz64(x82, x66, x42);
+ uint64_t x88 = cmovznz64(x82, x63, x39);
+ uint64_t x89 = cmovznz64(x82, x60, x36);
+ uint64_t x90 = cmovznz64(x82, x57, x33);
  return (x83, x84, x85, x86, x87, x88, x89, x90))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/montgomery64_2e521m1/feadd.c b/src/Specific/montgomery64_2e521m1/feadd.c
index 8dd56736b..1588992e9 100644
--- a/src/Specific/montgomery64_2e521m1/feadd.c
+++ b/src/Specific/montgomery64_2e521m1/feadd.c
@@ -36,15 +36,15 @@ static void feadd(uint64_t out[9], const uint64_t in1[9], const uint64_t in2[9])
   { uint64_t x85; uint8_t x86 = _subborrow_u64(x83, x58, 0xffffffffffffffffL, &x85);
   { uint64_t x88; uint8_t x89 = _subborrow_u64(x86, x61, 0x1ff, &x88);
   { uint64_t _; uint8_t x92 = _subborrow_u64(x89, x62, 0x0, &_);
-  { uint64_t x93 = cmovznz(x92, x88, x61);
-  { uint64_t x94 = cmovznz(x92, x85, x58);
-  { uint64_t x95 = cmovznz(x92, x82, x55);
-  { uint64_t x96 = cmovznz(x92, x79, x52);
-  { uint64_t x97 = cmovznz(x92, x76, x49);
-  { uint64_t x98 = cmovznz(x92, x73, x46);
-  { uint64_t x99 = cmovznz(x92, x70, x43);
-  { uint64_t x100 = cmovznz(x92, x67, x40);
-  { uint64_t x101 = cmovznz(x92, x64, x37);
+  { uint64_t x93 = cmovznz64(x92, x88, x61);
+  { uint64_t x94 = cmovznz64(x92, x85, x58);
+  { uint64_t x95 = cmovznz64(x92, x82, x55);
+  { uint64_t x96 = cmovznz64(x92, x79, x52);
+  { uint64_t x97 = cmovznz64(x92, x76, x49);
+  { uint64_t x98 = cmovznz64(x92, x73, x46);
+  { uint64_t x99 = cmovznz64(x92, x70, x43);
+  { uint64_t x100 = cmovznz64(x92, x67, x40);
+  { uint64_t x101 = cmovznz64(x92, x64, x37);
   out[0] = x101;
   out[1] = x100;
   out[2] = x99;
diff --git a/src/Specific/montgomery64_2e521m1/feaddDisplay.log b/src/Specific/montgomery64_2e521m1/feaddDisplay.log
index 80652f836..75f67f58f 100644
--- a/src/Specific/montgomery64_2e521m1/feaddDisplay.log
+++ b/src/Specific/montgomery64_2e521m1/feaddDisplay.log
@@ -21,15 +21,15 @@ Interp-η
  uint64_t x85, uint8_t x86 = subborrow_u64(x83, x58, 0xffffffffffffffffL);
  uint64_t x88, uint8_t x89 = subborrow_u64(x86, x61, 0x1ff);
  uint64_t _, uint8_t x92 = subborrow_u64(x89, x62, 0x0);
- uint64_t x93 = cmovznz(x92, x88, x61);
- uint64_t x94 = cmovznz(x92, x85, x58);
- uint64_t x95 = cmovznz(x92, x82, x55);
- uint64_t x96 = cmovznz(x92, x79, x52);
- uint64_t x97 = cmovznz(x92, x76, x49);
- uint64_t x98 = cmovznz(x92, x73, x46);
- uint64_t x99 = cmovznz(x92, x70, x43);
- uint64_t x100 = cmovznz(x92, x67, x40);
- uint64_t x101 = cmovznz(x92, x64, x37);
+ uint64_t x93 = cmovznz64(x92, x88, x61);
+ uint64_t x94 = cmovznz64(x92, x85, x58);
+ uint64_t x95 = cmovznz64(x92, x82, x55);
+ uint64_t x96 = cmovznz64(x92, x79, x52);
+ uint64_t x97 = cmovznz64(x92, x76, x49);
+ uint64_t x98 = cmovznz64(x92, x73, x46);
+ uint64_t x99 = cmovznz64(x92, x70, x43);
+ uint64_t x100 = cmovznz64(x92, x67, x40);
+ uint64_t x101 = cmovznz64(x92, x64, x37);
  return (x93, x94, x95, x96, x97, x98, x99, x100, x101))
 (x, x0)%core
      : word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/solinas32_2e127m1/freeze.c b/src/Specific/solinas32_2e127m1/freeze.c
index d99f9ec14..32e7cd19e 100644
--- a/src/Specific/solinas32_2e127m1/freeze.c
+++ b/src/Specific/solinas32_2e127m1/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x1fffff);
   { uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x1fffff);
   { uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x1fffff);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0x3fffff);
   { uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint32_t x34 = (x29 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e127m1/freezeDisplay.log b/src/Specific/solinas32_2e127m1/freezeDisplay.log
index c71a7fa52..46db8b723 100644
--- a/src/Specific/solinas32_2e127m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e127m1/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x1fffff);
  uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x1fffff);
  uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x1fffff);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0x3fffff);
  uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint32_t x34 = (x29 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e129m25/freeze.c b/src/Specific/solinas32_2e129m25/freeze.c
index 02e8390db..989ef2208 100644
--- a/src/Specific/solinas32_2e129m25/freeze.c
+++ b/src/Specific/solinas32_2e129m25/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x1fffff);
   { uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x3fffff);
   { uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x1fffff);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0x3fffe7);
   { uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint32_t x34 = (x29 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e129m25/freezeDisplay.log b/src/Specific/solinas32_2e129m25/freezeDisplay.log
index ca44e4644..3a22c8feb 100644
--- a/src/Specific/solinas32_2e129m25/freezeDisplay.log
+++ b/src/Specific/solinas32_2e129m25/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x1fffff);
  uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x3fffff);
  uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x1fffff);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0x3fffe7);
  uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint32_t x34 = (x29 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e130m5/freeze.c b/src/Specific/solinas32_2e130m5/freeze.c
index 5a39bcd67..dae1a6834 100644
--- a/src/Specific/solinas32_2e130m5/freeze.c
+++ b/src/Specific/solinas32_2e130m5/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x14, Return x6, 0x3ffffff);
   { uint32_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x17, Return x8, 0x3ffffff);
   { uint32_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x20, Return x7, 0x3ffffff);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0x3fffffb);
   { uint32_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
   { uint32_t x29 = (x24 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e130m5/freezeDisplay.log b/src/Specific/solinas32_2e130m5/freezeDisplay.log
index 5e7147d55..8aa0457e5 100644
--- a/src/Specific/solinas32_2e130m5/freezeDisplay.log
+++ b/src/Specific/solinas32_2e130m5/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x14, Return x6, 0x3ffffff);
  uint32_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x17, Return x8, 0x3ffffff);
  uint32_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x20, Return x7, 0x3ffffff);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0x3fffffb);
  uint32_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
  uint32_t x29 = (x24 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e137m13/freeze.c b/src/Specific/solinas32_2e137m13/freeze.c
index 57df7987e..41ddb9b33 100644
--- a/src/Specific/solinas32_2e137m13/freeze.c
+++ b/src/Specific/solinas32_2e137m13/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint32_t out[8], const uint32_t in1[8]) {
   { uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0x1ffff);
   { uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0x1ffff);
   { uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0x1ffff);
-  { uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+  { uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
   { uint32_t x40 = (x39 & 0x3fff3);
   { uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint32_t x44 = (x39 & 0x1ffff);
diff --git a/src/Specific/solinas32_2e137m13/freezeDisplay.log b/src/Specific/solinas32_2e137m13/freezeDisplay.log
index df593ca4b..38ee901dc 100644
--- a/src/Specific/solinas32_2e137m13/freezeDisplay.log
+++ b/src/Specific/solinas32_2e137m13/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0x1ffff);
  uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0x1ffff);
  uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0x1ffff);
- uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+ uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
  uint32_t x40 = (x39 & 0x3fff3);
  uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint32_t x44 = (x39 & 0x1ffff);
diff --git a/src/Specific/solinas32_2e140m27/freeze.c b/src/Specific/solinas32_2e140m27/freeze.c
index e4c539eb8..493e08507 100644
--- a/src/Specific/solinas32_2e140m27/freeze.c
+++ b/src/Specific/solinas32_2e140m27/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0xffffff);
   { uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x7fffff);
   { uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x7fffff);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xffffe5);
   { uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint32_t x34 = (x29 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e140m27/freezeDisplay.log b/src/Specific/solinas32_2e140m27/freezeDisplay.log
index b63257f0a..5fcd4aff9 100644
--- a/src/Specific/solinas32_2e140m27/freezeDisplay.log
+++ b/src/Specific/solinas32_2e140m27/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0xffffff);
  uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x7fffff);
  uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x7fffff);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xffffe5);
  uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint32_t x34 = (x29 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e141m9/freeze.c b/src/Specific/solinas32_2e141m9/freeze.c
index 847198cb2..24e968a49 100644
--- a/src/Specific/solinas32_2e141m9/freeze.c
+++ b/src/Specific/solinas32_2e141m9/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x7fffff);
   { uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0xffffff);
   { uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x7fffff);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xfffff7);
   { uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint32_t x34 = (x29 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e141m9/freezeDisplay.log b/src/Specific/solinas32_2e141m9/freezeDisplay.log
index 253dd3a40..d4ea4280b 100644
--- a/src/Specific/solinas32_2e141m9/freezeDisplay.log
+++ b/src/Specific/solinas32_2e141m9/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x7fffff);
  uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0xffffff);
  uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x7fffff);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xfffff7);
  uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint32_t x34 = (x29 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e150m3/freeze.c b/src/Specific/solinas32_2e150m3/freeze.c
index 893c8987f..67cb60d3c 100644
--- a/src/Specific/solinas32_2e150m3/freeze.c
+++ b/src/Specific/solinas32_2e150m3/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x14, Return x6, 0x3fffffff);
   { uint32_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x17, Return x8, 0x3fffffff);
   { uint32_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x20, Return x7, 0x3fffffff);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0x3ffffffd);
   { uint32_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
   { uint32_t x29 = (x24 & 0x3fffffff);
diff --git a/src/Specific/solinas32_2e150m3/freezeDisplay.log b/src/Specific/solinas32_2e150m3/freezeDisplay.log
index 6e16d3c14..97c1f9e25 100644
--- a/src/Specific/solinas32_2e150m3/freezeDisplay.log
+++ b/src/Specific/solinas32_2e150m3/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x14, Return x6, 0x3fffffff);
  uint32_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x17, Return x8, 0x3fffffff);
  uint32_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x20, Return x7, 0x3fffffff);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0x3ffffffd);
  uint32_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
  uint32_t x29 = (x24 & 0x3fffffff);
diff --git a/src/Specific/solinas32_2e150m5/freeze.c b/src/Specific/solinas32_2e150m5/freeze.c
index 190a62637..877b3693b 100644
--- a/src/Specific/solinas32_2e150m5/freeze.c
+++ b/src/Specific/solinas32_2e150m5/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x1ffffff);
   { uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x1ffffff);
   { uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x1ffffff);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0x1fffffb);
   { uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint32_t x34 = (x29 & 0x1ffffff);
diff --git a/src/Specific/solinas32_2e150m5/freezeDisplay.log b/src/Specific/solinas32_2e150m5/freezeDisplay.log
index 63250abea..9a4af32ee 100644
--- a/src/Specific/solinas32_2e150m5/freezeDisplay.log
+++ b/src/Specific/solinas32_2e150m5/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x1ffffff);
  uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x1ffffff);
  uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x1ffffff);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0x1fffffb);
  uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint32_t x34 = (x29 & 0x1ffffff);
diff --git a/src/Specific/solinas32_2e152m17/freeze.c b/src/Specific/solinas32_2e152m17/freeze.c
index 23f92e53d..539597636 100644
--- a/src/Specific/solinas32_2e152m17/freeze.c
+++ b/src/Specific/solinas32_2e152m17/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x3ffffff);
   { uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x1ffffff);
   { uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x1ffffff);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0x3ffffef);
   { uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint32_t x34 = (x29 & 0x1ffffff);
diff --git a/src/Specific/solinas32_2e152m17/freezeDisplay.log b/src/Specific/solinas32_2e152m17/freezeDisplay.log
index 0633d5a0c..5d8bdcde7 100644
--- a/src/Specific/solinas32_2e152m17/freezeDisplay.log
+++ b/src/Specific/solinas32_2e152m17/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x3ffffff);
  uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x1ffffff);
  uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x1ffffff);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0x3ffffef);
  uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint32_t x34 = (x29 & 0x1ffffff);
diff --git a/src/Specific/solinas32_2e158m15/freeze.c b/src/Specific/solinas32_2e158m15/freeze.c
index e9883c30c..c465eb5ed 100644
--- a/src/Specific/solinas32_2e158m15/freeze.c
+++ b/src/Specific/solinas32_2e158m15/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x7ffffff);
   { uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x3ffffff);
   { uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x3ffffff);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0x7fffff1);
   { uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint32_t x34 = (x29 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e158m15/freezeDisplay.log b/src/Specific/solinas32_2e158m15/freezeDisplay.log
index 89f62b8f6..9df853258 100644
--- a/src/Specific/solinas32_2e158m15/freezeDisplay.log
+++ b/src/Specific/solinas32_2e158m15/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x7ffffff);
  uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x3ffffff);
  uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x3ffffff);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0x7fffff1);
  uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint32_t x34 = (x29 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e165m25/freeze.c b/src/Specific/solinas32_2e165m25/freeze.c
index 69d1a6adb..c2d7b5da7 100644
--- a/src/Specific/solinas32_2e165m25/freeze.c
+++ b/src/Specific/solinas32_2e165m25/freeze.c
@@ -17,7 +17,7 @@ static void freeze(uint32_t out[9], const uint32_t in1[9]) {
   { uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x7ffff);
   { uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x3ffff);
   { uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x3ffff);
-  { uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+  { uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
   { uint32_t x45 = (x44 & 0x7ffe7);
   { uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
   { uint32_t x49 = (x44 & 0x3ffff);
diff --git a/src/Specific/solinas32_2e165m25/freezeDisplay.log b/src/Specific/solinas32_2e165m25/freezeDisplay.log
index 079c15c43..38ceca627 100644
--- a/src/Specific/solinas32_2e165m25/freezeDisplay.log
+++ b/src/Specific/solinas32_2e165m25/freezeDisplay.log
@@ -11,7 +11,7 @@ Interp-η
  uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x7ffff);
  uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x3ffff);
  uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x3ffff);
- uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+ uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
  uint32_t x45 = (x44 & 0x7ffe7);
  uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
  uint32_t x49 = (x44 & 0x3ffff);
diff --git a/src/Specific/solinas32_2e166m5/freeze.c b/src/Specific/solinas32_2e166m5/freeze.c
index 2d342491a..935763dcd 100644
--- a/src/Specific/solinas32_2e166m5/freeze.c
+++ b/src/Specific/solinas32_2e166m5/freeze.c
@@ -21,7 +21,7 @@ static void freeze(uint32_t out[11], const uint32_t in1[11]) {
   { uint32_t x46, uint8_t x47 = Op (Syntax.SubWithGetBorrow 15 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x44, Return x18, 0x7fff);
   { uint32_t x49, uint8_t x50 = Op (Syntax.SubWithGetBorrow 15 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x47, Return x20, 0x7fff);
   { uint32_t x52, uint8_t x53 = Op (Syntax.SubWithGetBorrow 15 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x50, Return x19, 0x7fff);
-  { uint32_t x54 = (uint32_t)cmovznz(x53, 0x0, 0xffffffff);
+  { uint32_t x54 = cmovznz32(x53, 0x0, 0xffffffff);
   { uint32_t x55 = (x54 & 0xfffb);
   { uint32_t x57, uint8_t x58 = Op (Syntax.AddWithGetCarry 16 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x22, Return x55);
   { uint32_t x59 = (x54 & 0x7fff);
diff --git a/src/Specific/solinas32_2e166m5/freezeDisplay.log b/src/Specific/solinas32_2e166m5/freezeDisplay.log
index b9a0b5514..8090bd7f8 100644
--- a/src/Specific/solinas32_2e166m5/freezeDisplay.log
+++ b/src/Specific/solinas32_2e166m5/freezeDisplay.log
@@ -13,7 +13,7 @@ Interp-η
  uint32_t x46, uint8_t x47 = Op (Syntax.SubWithGetBorrow 15 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x44, Return x18, 0x7fff);
  uint32_t x49, uint8_t x50 = Op (Syntax.SubWithGetBorrow 15 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x47, Return x20, 0x7fff);
  uint32_t x52, uint8_t x53 = Op (Syntax.SubWithGetBorrow 15 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x50, Return x19, 0x7fff);
- uint32_t x54 = (uint32_t)cmovznz(x53, 0x0, 0xffffffff);
+ uint32_t x54 = cmovznz32(x53, 0x0, 0xffffffff);
  uint32_t x55 = (x54 & 0xfffb);
  uint32_t x57, uint8_t x58 = Op (Syntax.AddWithGetCarry 16 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x22, Return x55);
  uint32_t x59 = (x54 & 0x7fff);
diff --git a/src/Specific/solinas32_2e171m19/freeze.c b/src/Specific/solinas32_2e171m19/freeze.c
index 857956aaf..e98d0da33 100644
--- a/src/Specific/solinas32_2e171m19/freeze.c
+++ b/src/Specific/solinas32_2e171m19/freeze.c
@@ -17,7 +17,7 @@ static void freeze(uint32_t out[9], const uint32_t in1[9]) {
   { uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x7ffff);
   { uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x7ffff);
   { uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x7ffff);
-  { uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+  { uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
   { uint32_t x45 = (x44 & 0x7ffed);
   { uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
   { uint32_t x49 = (x44 & 0x7ffff);
diff --git a/src/Specific/solinas32_2e171m19/freezeDisplay.log b/src/Specific/solinas32_2e171m19/freezeDisplay.log
index a9af4bd45..19e834e01 100644
--- a/src/Specific/solinas32_2e171m19/freezeDisplay.log
+++ b/src/Specific/solinas32_2e171m19/freezeDisplay.log
@@ -11,7 +11,7 @@ Interp-η
  uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x7ffff);
  uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x7ffff);
  uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x7ffff);
- uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+ uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
  uint32_t x45 = (x44 & 0x7ffed);
  uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
  uint32_t x49 = (x44 & 0x7ffff);
diff --git a/src/Specific/solinas32_2e174m17/freeze.c b/src/Specific/solinas32_2e174m17/freeze.c
index 30bc800c9..fced203d0 100644
--- a/src/Specific/solinas32_2e174m17/freeze.c
+++ b/src/Specific/solinas32_2e174m17/freeze.c
@@ -17,7 +17,7 @@ static void freeze(uint32_t out[9], const uint32_t in1[9]) {
   { uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0xfffff);
   { uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x7ffff);
   { uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x7ffff);
-  { uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+  { uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
   { uint32_t x45 = (x44 & 0xfffef);
   { uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
   { uint32_t x49 = (x44 & 0x7ffff);
diff --git a/src/Specific/solinas32_2e174m17/freezeDisplay.log b/src/Specific/solinas32_2e174m17/freezeDisplay.log
index 86168e41a..89d216e43 100644
--- a/src/Specific/solinas32_2e174m17/freezeDisplay.log
+++ b/src/Specific/solinas32_2e174m17/freezeDisplay.log
@@ -11,7 +11,7 @@ Interp-η
  uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0xfffff);
  uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x7ffff);
  uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x7ffff);
- uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+ uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
  uint32_t x45 = (x44 & 0xfffef);
  uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
  uint32_t x49 = (x44 & 0x7ffff);
diff --git a/src/Specific/solinas32_2e174m3/freeze.c b/src/Specific/solinas32_2e174m3/freeze.c
index 6132d303e..0c152773f 100644
--- a/src/Specific/solinas32_2e174m3/freeze.c
+++ b/src/Specific/solinas32_2e174m3/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x1fffffff);
   { uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x1fffffff);
   { uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x1fffffff);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0x1ffffffd);
   { uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint32_t x34 = (x29 & 0x1fffffff);
diff --git a/src/Specific/solinas32_2e174m3/freezeDisplay.log b/src/Specific/solinas32_2e174m3/freezeDisplay.log
index a31b78af6..87e105a0a 100644
--- a/src/Specific/solinas32_2e174m3/freezeDisplay.log
+++ b/src/Specific/solinas32_2e174m3/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x19, Return x8, 0x1fffffff);
  uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x22, Return x10, 0x1fffffff);
  uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x9, 0x1fffffff);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0x1ffffffd);
  uint32_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint32_t x34 = (x29 & 0x1fffffff);
diff --git a/src/Specific/solinas32_2e189m25/freeze.c b/src/Specific/solinas32_2e189m25/freeze.c
index 5abf7afb8..861a4917d 100644
--- a/src/Specific/solinas32_2e189m25/freeze.c
+++ b/src/Specific/solinas32_2e189m25/freeze.c
@@ -13,7 +13,7 @@ static void freeze(uint32_t out[7], const uint32_t in1[7]) {
   { uint32_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x24, Return x10, 0x7ffffff);
   { uint32_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x27, Return x12, 0x7ffffff);
   { uint32_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x30, Return x11, 0x7ffffff);
-  { uint32_t x34 = (uint32_t)cmovznz(x33, 0x0, 0xffffffff);
+  { uint32_t x34 = cmovznz32(x33, 0x0, 0xffffffff);
   { uint32_t x35 = (x34 & 0x7ffffe7);
   { uint32_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
   { uint32_t x39 = (x34 & 0x7ffffff);
diff --git a/src/Specific/solinas32_2e189m25/freezeDisplay.log b/src/Specific/solinas32_2e189m25/freezeDisplay.log
index df64c1fd5..8094a8368 100644
--- a/src/Specific/solinas32_2e189m25/freezeDisplay.log
+++ b/src/Specific/solinas32_2e189m25/freezeDisplay.log
@@ -9,7 +9,7 @@ Interp-η
  uint32_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x24, Return x10, 0x7ffffff);
  uint32_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x27, Return x12, 0x7ffffff);
  uint32_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x30, Return x11, 0x7ffffff);
- uint32_t x34 = (uint32_t)cmovznz(x33, 0x0, 0xffffffff);
+ uint32_t x34 = cmovznz32(x33, 0x0, 0xffffffff);
  uint32_t x35 = (x34 & 0x7ffffe7);
  uint32_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
  uint32_t x39 = (x34 & 0x7ffffff);
diff --git a/src/Specific/solinas32_2e190m11/freeze.c b/src/Specific/solinas32_2e190m11/freeze.c
index 61f77c31f..6e4e52017 100644
--- a/src/Specific/solinas32_2e190m11/freeze.c
+++ b/src/Specific/solinas32_2e190m11/freeze.c
@@ -13,7 +13,7 @@ static void freeze(uint32_t out[7], const uint32_t in1[7]) {
   { uint32_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x24, Return x10, 0x7ffffff);
   { uint32_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x27, Return x12, 0x7ffffff);
   { uint32_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x30, Return x11, 0x7ffffff);
-  { uint32_t x34 = (uint32_t)cmovznz(x33, 0x0, 0xffffffff);
+  { uint32_t x34 = cmovznz32(x33, 0x0, 0xffffffff);
   { uint32_t x35 = (x34 & 0xffffff5);
   { uint32_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
   { uint32_t x39 = (x34 & 0x7ffffff);
diff --git a/src/Specific/solinas32_2e190m11/freezeDisplay.log b/src/Specific/solinas32_2e190m11/freezeDisplay.log
index 5f6b93eb3..1e9673e6c 100644
--- a/src/Specific/solinas32_2e190m11/freezeDisplay.log
+++ b/src/Specific/solinas32_2e190m11/freezeDisplay.log
@@ -9,7 +9,7 @@ Interp-η
  uint32_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x24, Return x10, 0x7ffffff);
  uint32_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x27, Return x12, 0x7ffffff);
  uint32_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x30, Return x11, 0x7ffffff);
- uint32_t x34 = (uint32_t)cmovznz(x33, 0x0, 0xffffffff);
+ uint32_t x34 = cmovznz32(x33, 0x0, 0xffffffff);
  uint32_t x35 = (x34 & 0xffffff5);
  uint32_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
  uint32_t x39 = (x34 & 0x7ffffff);
diff --git a/src/Specific/solinas32_2e191m19/freeze.c b/src/Specific/solinas32_2e191m19/freeze.c
index 440e3f628..554152fcd 100644
--- a/src/Specific/solinas32_2e191m19/freeze.c
+++ b/src/Specific/solinas32_2e191m19/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint32_t out[10], const uint32_t in1[10]) {
   { uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x7ffff);
   { uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x7ffff);
   { uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x7ffff);
-  { uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+  { uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
   { uint32_t x50 = (x49 & 0xfffed);
   { uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint32_t x54 = (x49 & 0x7ffff);
diff --git a/src/Specific/solinas32_2e191m19/freezeDisplay.log b/src/Specific/solinas32_2e191m19/freezeDisplay.log
index b7de28a89..3a3e1c4b1 100644
--- a/src/Specific/solinas32_2e191m19/freezeDisplay.log
+++ b/src/Specific/solinas32_2e191m19/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x7ffff);
  uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x7ffff);
  uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x7ffff);
- uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+ uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
  uint32_t x50 = (x49 & 0xfffed);
  uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint32_t x54 = (x49 & 0x7ffff);
diff --git a/src/Specific/solinas32_2e192m2e64m1/freeze.c b/src/Specific/solinas32_2e192m2e64m1/freeze.c
index a2c6fa5b6..daca882d5 100644
--- a/src/Specific/solinas32_2e192m2e64m1/freeze.c
+++ b/src/Specific/solinas32_2e192m2e64m1/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint32_t out[8], const uint32_t in1[8]) {
   { uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffff);
   { uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffff);
   { uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffff);
-  { uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+  { uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
   { uint32_t x40 = (x39 & 0xffffff);
   { uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint32_t x44 = (x39 & 0xffffff);
diff --git a/src/Specific/solinas32_2e192m2e64m1/freezeDisplay.log b/src/Specific/solinas32_2e192m2e64m1/freezeDisplay.log
index f1b01b28a..61e584107 100644
--- a/src/Specific/solinas32_2e192m2e64m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e192m2e64m1/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffff);
  uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffff);
  uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffff);
- uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+ uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
  uint32_t x40 = (x39 & 0xffffff);
  uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint32_t x44 = (x39 & 0xffffff);
diff --git a/src/Specific/solinas32_2e194m33/freeze.c b/src/Specific/solinas32_2e194m33/freeze.c
index 9dd22f931..a56db3e82 100644
--- a/src/Specific/solinas32_2e194m33/freeze.c
+++ b/src/Specific/solinas32_2e194m33/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint32_t out[8], const uint32_t in1[8]) {
   { uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffff);
   { uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffff);
   { uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffff);
-  { uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+  { uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
   { uint32_t x40 = (x39 & 0x1ffffdf);
   { uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint32_t x44 = (x39 & 0xffffff);
diff --git a/src/Specific/solinas32_2e194m33/freezeDisplay.log b/src/Specific/solinas32_2e194m33/freezeDisplay.log
index bc97359c4..64df88137 100644
--- a/src/Specific/solinas32_2e194m33/freezeDisplay.log
+++ b/src/Specific/solinas32_2e194m33/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffff);
  uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffff);
  uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffff);
- uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+ uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
  uint32_t x40 = (x39 & 0x1ffffdf);
  uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint32_t x44 = (x39 & 0xffffff);
diff --git a/src/Specific/solinas32_2e196m15/freeze.c b/src/Specific/solinas32_2e196m15/freeze.c
index 8a06700b4..705ff1718 100644
--- a/src/Specific/solinas32_2e196m15/freeze.c
+++ b/src/Specific/solinas32_2e196m15/freeze.c
@@ -13,7 +13,7 @@ static void freeze(uint32_t out[7], const uint32_t in1[7]) {
   { uint32_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x24, Return x10, 0xfffffff);
   { uint32_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x27, Return x12, 0xfffffff);
   { uint32_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x30, Return x11, 0xfffffff);
-  { uint32_t x34 = (uint32_t)cmovznz(x33, 0x0, 0xffffffff);
+  { uint32_t x34 = cmovznz32(x33, 0x0, 0xffffffff);
   { uint32_t x35 = (x34 & 0xffffff1);
   { uint32_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
   { uint32_t x39 = (x34 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e196m15/freezeDisplay.log b/src/Specific/solinas32_2e196m15/freezeDisplay.log
index e7aef2bf0..9c4dbc31b 100644
--- a/src/Specific/solinas32_2e196m15/freezeDisplay.log
+++ b/src/Specific/solinas32_2e196m15/freezeDisplay.log
@@ -9,7 +9,7 @@ Interp-η
  uint32_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x24, Return x10, 0xfffffff);
  uint32_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x27, Return x12, 0xfffffff);
  uint32_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x30, Return x11, 0xfffffff);
- uint32_t x34 = (uint32_t)cmovznz(x33, 0x0, 0xffffffff);
+ uint32_t x34 = cmovznz32(x33, 0x0, 0xffffffff);
  uint32_t x35 = (x34 & 0xffffff1);
  uint32_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
  uint32_t x39 = (x34 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e198m17/freeze.c b/src/Specific/solinas32_2e198m17/freeze.c
index 607572e4f..869e5f82d 100644
--- a/src/Specific/solinas32_2e198m17/freeze.c
+++ b/src/Specific/solinas32_2e198m17/freeze.c
@@ -17,7 +17,7 @@ static void freeze(uint32_t out[9], const uint32_t in1[9]) {
   { uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x3fffff);
   { uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x3fffff);
   { uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x3fffff);
-  { uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+  { uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
   { uint32_t x45 = (x44 & 0x3fffef);
   { uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
   { uint32_t x49 = (x44 & 0x3fffff);
diff --git a/src/Specific/solinas32_2e198m17/freezeDisplay.log b/src/Specific/solinas32_2e198m17/freezeDisplay.log
index 6214988b0..e249734b6 100644
--- a/src/Specific/solinas32_2e198m17/freezeDisplay.log
+++ b/src/Specific/solinas32_2e198m17/freezeDisplay.log
@@ -11,7 +11,7 @@ Interp-η
  uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x3fffff);
  uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x3fffff);
  uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x3fffff);
- uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+ uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
  uint32_t x45 = (x44 & 0x3fffef);
  uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
  uint32_t x49 = (x44 & 0x3fffff);
diff --git a/src/Specific/solinas32_2e205m45x2e198m1/freeze.c b/src/Specific/solinas32_2e205m45x2e198m1/freeze.c
index 133001801..e408b8d5b 100644
--- a/src/Specific/solinas32_2e205m45x2e198m1/freeze.c
+++ b/src/Specific/solinas32_2e205m45x2e198m1/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint32_t out[10], const uint32_t in1[10]) {
   { uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0xfffff);
   { uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x1fffff);
   { uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0xa5fff);
-  { uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+  { uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
   { uint32_t x50 = (x49 & 0x1fffff);
   { uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint32_t x54 = (x49 & 0xfffff);
diff --git a/src/Specific/solinas32_2e205m45x2e198m1/freezeDisplay.log b/src/Specific/solinas32_2e205m45x2e198m1/freezeDisplay.log
index 6a0751372..cbcc0584c 100644
--- a/src/Specific/solinas32_2e205m45x2e198m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e205m45x2e198m1/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0xfffff);
  uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x1fffff);
  uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0xa5fff);
- uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+ uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
  uint32_t x50 = (x49 & 0x1fffff);
  uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint32_t x54 = (x49 & 0xfffff);
diff --git a/src/Specific/solinas32_2e206m5/freeze.c b/src/Specific/solinas32_2e206m5/freeze.c
index a573bc45c..1a59cce08 100644
--- a/src/Specific/solinas32_2e206m5/freeze.c
+++ b/src/Specific/solinas32_2e206m5/freeze.c
@@ -23,7 +23,7 @@ static void freeze(uint32_t out[12], const uint32_t in1[12]) {
   { uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x1ffff);
   { uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1ffff);
   { uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1ffff);
-  { uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+  { uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
   { uint32_t x60 = (x59 & 0x3fffb);
   { uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
   { uint32_t x64 = (x59 & 0x1ffff);
diff --git a/src/Specific/solinas32_2e206m5/freezeDisplay.log b/src/Specific/solinas32_2e206m5/freezeDisplay.log
index 7e1369ec7..5a2a8d831 100644
--- a/src/Specific/solinas32_2e206m5/freezeDisplay.log
+++ b/src/Specific/solinas32_2e206m5/freezeDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x1ffff);
  uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1ffff);
  uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1ffff);
- uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+ uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
  uint32_t x60 = (x59 & 0x3fffb);
  uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
  uint32_t x64 = (x59 & 0x1ffff);
diff --git a/src/Specific/solinas32_2e212m29/freeze.c b/src/Specific/solinas32_2e212m29/freeze.c
index a26e85d79..6c723743b 100644
--- a/src/Specific/solinas32_2e212m29/freeze.c
+++ b/src/Specific/solinas32_2e212m29/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint32_t out[8], const uint32_t in1[8]) {
   { uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0x3ffffff);
   { uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0x7ffffff);
   { uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0x3ffffff);
-  { uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+  { uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
   { uint32_t x40 = (x39 & 0x7ffffe3);
   { uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint32_t x44 = (x39 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e212m29/freezeDisplay.log b/src/Specific/solinas32_2e212m29/freezeDisplay.log
index ba04304d7..a8e542125 100644
--- a/src/Specific/solinas32_2e212m29/freezeDisplay.log
+++ b/src/Specific/solinas32_2e212m29/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0x3ffffff);
  uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0x7ffffff);
  uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0x3ffffff);
- uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+ uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
  uint32_t x40 = (x39 & 0x7ffffe3);
  uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint32_t x44 = (x39 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e213m3/freeze.c b/src/Specific/solinas32_2e213m3/freeze.c
index 35244bbe7..5c4380cbd 100644
--- a/src/Specific/solinas32_2e213m3/freeze.c
+++ b/src/Specific/solinas32_2e213m3/freeze.c
@@ -29,7 +29,7 @@ static void freeze(uint32_t out[15], const uint32_t in1[15]) {
   { uint32_t x66, uint8_t x67 = Op (Syntax.SubWithGetBorrow 14 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x64, Return x26, 0x3fff);
   { uint32_t x69, uint8_t x70 = Op (Syntax.SubWithGetBorrow 14 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x67, Return x28, 0x3fff);
   { uint32_t x72, uint8_t x73 = Op (Syntax.SubWithGetBorrow 14 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x70, Return x27, 0x3fff);
-  { uint32_t x74 = (uint32_t)cmovznz(x73, 0x0, 0xffffffff);
+  { uint32_t x74 = cmovznz32(x73, 0x0, 0xffffffff);
   { uint32_t x75 = (x74 & 0x7ffd);
   { uint32_t x77, uint8_t x78 = Op (Syntax.AddWithGetCarry 15 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x30, Return x75);
   { uint32_t x79 = (x74 & 0x3fff);
diff --git a/src/Specific/solinas32_2e213m3/freezeDisplay.log b/src/Specific/solinas32_2e213m3/freezeDisplay.log
index 88998b0bd..6601ccdc1 100644
--- a/src/Specific/solinas32_2e213m3/freezeDisplay.log
+++ b/src/Specific/solinas32_2e213m3/freezeDisplay.log
@@ -17,7 +17,7 @@ Interp-η
  uint32_t x66, uint8_t x67 = Op (Syntax.SubWithGetBorrow 14 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x64, Return x26, 0x3fff);
  uint32_t x69, uint8_t x70 = Op (Syntax.SubWithGetBorrow 14 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x67, Return x28, 0x3fff);
  uint32_t x72, uint8_t x73 = Op (Syntax.SubWithGetBorrow 14 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x70, Return x27, 0x3fff);
- uint32_t x74 = (uint32_t)cmovznz(x73, 0x0, 0xffffffff);
+ uint32_t x74 = cmovznz32(x73, 0x0, 0xffffffff);
  uint32_t x75 = (x74 & 0x7ffd);
  uint32_t x77, uint8_t x78 = Op (Syntax.AddWithGetCarry 15 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x30, Return x75);
  uint32_t x79 = (x74 & 0x3fff);
diff --git a/src/Specific/solinas32_2e216m2e108m1/freeze.c b/src/Specific/solinas32_2e216m2e108m1/freeze.c
index a47de88e6..b491fbbf7 100644
--- a/src/Specific/solinas32_2e216m2e108m1/freeze.c
+++ b/src/Specific/solinas32_2e216m2e108m1/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint32_t out[8], const uint32_t in1[8]) {
   { uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0x7ffffff);
   { uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0x7ffffff);
   { uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0x7ffffff);
-  { uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+  { uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
   { uint32_t x40 = (x39 & 0x7ffffff);
   { uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint32_t x44 = (x39 & 0x7ffffff);
diff --git a/src/Specific/solinas32_2e216m2e108m1/freezeDisplay.log b/src/Specific/solinas32_2e216m2e108m1/freezeDisplay.log
index a324e292b..18b6d8b72 100644
--- a/src/Specific/solinas32_2e216m2e108m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e216m2e108m1/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0x7ffffff);
  uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0x7ffffff);
  uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0x7ffffff);
- uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+ uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
  uint32_t x40 = (x39 & 0x7ffffff);
  uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint32_t x44 = (x39 & 0x7ffffff);
diff --git a/src/Specific/solinas32_2e221m3/freeze.c b/src/Specific/solinas32_2e221m3/freeze.c
index 79656b2c4..2cf1e5e15 100644
--- a/src/Specific/solinas32_2e221m3/freeze.c
+++ b/src/Specific/solinas32_2e221m3/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint32_t out[10], const uint32_t in1[10]) {
   { uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x3fffff);
   { uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x3fffff);
   { uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x3fffff);
-  { uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+  { uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
   { uint32_t x50 = (x49 & 0x7ffffd);
   { uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint32_t x54 = (x49 & 0x3fffff);
diff --git a/src/Specific/solinas32_2e221m3/freezeDisplay.log b/src/Specific/solinas32_2e221m3/freezeDisplay.log
index b9cc0780e..ed418de2c 100644
--- a/src/Specific/solinas32_2e221m3/freezeDisplay.log
+++ b/src/Specific/solinas32_2e221m3/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x3fffff);
  uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x3fffff);
  uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x3fffff);
- uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+ uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
  uint32_t x50 = (x49 & 0x7ffffd);
  uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint32_t x54 = (x49 & 0x3fffff);
diff --git a/src/Specific/solinas32_2e222m117/freeze.c b/src/Specific/solinas32_2e222m117/freeze.c
index 10c86762a..31e1b5c00 100644
--- a/src/Specific/solinas32_2e222m117/freeze.c
+++ b/src/Specific/solinas32_2e222m117/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint32_t out[10], const uint32_t in1[10]) {
   { uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x3fffff);
   { uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x3fffff);
   { uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x3fffff);
-  { uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+  { uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
   { uint32_t x50 = (x49 & 0x7fff8b);
   { uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint32_t x54 = (x49 & 0x3fffff);
diff --git a/src/Specific/solinas32_2e222m117/freezeDisplay.log b/src/Specific/solinas32_2e222m117/freezeDisplay.log
index 0d76b83bc..d4ff62712 100644
--- a/src/Specific/solinas32_2e222m117/freezeDisplay.log
+++ b/src/Specific/solinas32_2e222m117/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x3fffff);
  uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x3fffff);
  uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x3fffff);
- uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+ uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
  uint32_t x50 = (x49 & 0x7fff8b);
  uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint32_t x54 = (x49 & 0x3fffff);
diff --git a/src/Specific/solinas32_2e224m2e96p1/freeze.c b/src/Specific/solinas32_2e224m2e96p1/freeze.c
index f2dffb5bc..c08c5d55d 100644
--- a/src/Specific/solinas32_2e224m2e96p1/freeze.c
+++ b/src/Specific/solinas32_2e224m2e96p1/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint32_t out[8], const uint32_t in1[8]) {
   { uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0xfffffff);
   { uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0xfffffff);
   { uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0xfffffff);
-  { uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+  { uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
   { uint8_t x40 = ((uint8_t)x39 & 0x1);
   { uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint32_t x45, uint8_t x46 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x43, Return x19, 0x0);
diff --git a/src/Specific/solinas32_2e224m2e96p1/freezeDisplay.log b/src/Specific/solinas32_2e224m2e96p1/freezeDisplay.log
index b63426559..bd024746f 100644
--- a/src/Specific/solinas32_2e224m2e96p1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e224m2e96p1/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0xfffffff);
  uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0xfffffff);
  uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0xfffffff);
- uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+ uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
  uint8_t x40 = ((uint8_t)x39 & 0x1);
  uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint32_t x45, uint8_t x46 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x43, Return x19, 0x0);
diff --git a/src/Specific/solinas32_2e226m5/freeze.c b/src/Specific/solinas32_2e226m5/freeze.c
index 96d54a5c0..4e1dbd3ff 100644
--- a/src/Specific/solinas32_2e226m5/freeze.c
+++ b/src/Specific/solinas32_2e226m5/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint32_t out[8], const uint32_t in1[8]) {
   { uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0xfffffff);
   { uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0xfffffff);
   { uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0xfffffff);
-  { uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+  { uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
   { uint32_t x40 = (x39 & 0x1ffffffb);
   { uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint32_t x44 = (x39 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e226m5/freezeDisplay.log b/src/Specific/solinas32_2e226m5/freezeDisplay.log
index bdf2266d4..2af887e79 100644
--- a/src/Specific/solinas32_2e226m5/freezeDisplay.log
+++ b/src/Specific/solinas32_2e226m5/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0xfffffff);
  uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0xfffffff);
  uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0xfffffff);
- uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+ uint32_t x39 = cmovznz32(x38, 0x0, 0xffffffff);
  uint32_t x40 = (x39 & 0x1ffffffb);
  uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint32_t x44 = (x39 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e230m27/freeze.c b/src/Specific/solinas32_2e230m27/freeze.c
index 0de32b862..feed33dcc 100644
--- a/src/Specific/solinas32_2e230m27/freeze.c
+++ b/src/Specific/solinas32_2e230m27/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint32_t out[10], const uint32_t in1[10]) {
   { uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x7fffff);
   { uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x7fffff);
   { uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x7fffff);
-  { uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+  { uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
   { uint32_t x50 = (x49 & 0x7fffe5);
   { uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint32_t x54 = (x49 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e230m27/freezeDisplay.log b/src/Specific/solinas32_2e230m27/freezeDisplay.log
index 48b8929e2..cdedba2b3 100644
--- a/src/Specific/solinas32_2e230m27/freezeDisplay.log
+++ b/src/Specific/solinas32_2e230m27/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x7fffff);
  uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x7fffff);
  uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x7fffff);
- uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+ uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
  uint32_t x50 = (x49 & 0x7fffe5);
  uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint32_t x54 = (x49 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e235m15/freeze.c b/src/Specific/solinas32_2e235m15/freeze.c
index 200181eb7..12fd6ce06 100644
--- a/src/Specific/solinas32_2e235m15/freeze.c
+++ b/src/Specific/solinas32_2e235m15/freeze.c
@@ -17,7 +17,7 @@ static void freeze(uint32_t out[9], const uint32_t in1[9]) {
   { uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x3ffffff);
   { uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x3ffffff);
   { uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x3ffffff);
-  { uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+  { uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
   { uint32_t x45 = (x44 & 0x7fffff1);
   { uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
   { uint32_t x49 = (x44 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e235m15/freezeDisplay.log b/src/Specific/solinas32_2e235m15/freezeDisplay.log
index e51f4b6e1..2b247c4a5 100644
--- a/src/Specific/solinas32_2e235m15/freezeDisplay.log
+++ b/src/Specific/solinas32_2e235m15/freezeDisplay.log
@@ -11,7 +11,7 @@ Interp-η
  uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x3ffffff);
  uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x3ffffff);
  uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x3ffffff);
- uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+ uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
  uint32_t x45 = (x44 & 0x7fffff1);
  uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
  uint32_t x49 = (x44 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e243m9/freeze.c b/src/Specific/solinas32_2e243m9/freeze.c
index f6d5f81b4..e0a268881 100644
--- a/src/Specific/solinas32_2e243m9/freeze.c
+++ b/src/Specific/solinas32_2e243m9/freeze.c
@@ -17,7 +17,7 @@ static void freeze(uint32_t out[9], const uint32_t in1[9]) {
   { uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x7ffffff);
   { uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x7ffffff);
   { uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x7ffffff);
-  { uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+  { uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
   { uint32_t x45 = (x44 & 0x7fffff7);
   { uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
   { uint32_t x49 = (x44 & 0x7ffffff);
diff --git a/src/Specific/solinas32_2e243m9/freezeDisplay.log b/src/Specific/solinas32_2e243m9/freezeDisplay.log
index c99609247..3c74627ca 100644
--- a/src/Specific/solinas32_2e243m9/freezeDisplay.log
+++ b/src/Specific/solinas32_2e243m9/freezeDisplay.log
@@ -11,7 +11,7 @@ Interp-η
  uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x7ffffff);
  uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0x7ffffff);
  uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0x7ffffff);
- uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+ uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
  uint32_t x45 = (x44 & 0x7fffff7);
  uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
  uint32_t x49 = (x44 & 0x7ffffff);
diff --git a/src/Specific/solinas32_2e251m9/freeze.c b/src/Specific/solinas32_2e251m9/freeze.c
index d838290a1..ace9aa146 100644
--- a/src/Specific/solinas32_2e251m9/freeze.c
+++ b/src/Specific/solinas32_2e251m9/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint32_t out[10], const uint32_t in1[10]) {
   { uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x1ffffff);
   { uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x1ffffff);
   { uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x1ffffff);
-  { uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+  { uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
   { uint32_t x50 = (x49 & 0x3fffff7);
   { uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint32_t x54 = (x49 & 0x1ffffff);
diff --git a/src/Specific/solinas32_2e251m9/freezeDisplay.log b/src/Specific/solinas32_2e251m9/freezeDisplay.log
index a04ae83f7..740c0f5ae 100644
--- a/src/Specific/solinas32_2e251m9/freezeDisplay.log
+++ b/src/Specific/solinas32_2e251m9/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x1ffffff);
  uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x1ffffff);
  uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x1ffffff);
- uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+ uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
  uint32_t x50 = (x49 & 0x3fffff7);
  uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint32_t x54 = (x49 & 0x1ffffff);
diff --git a/src/Specific/solinas32_2e254m127x2e240m1/freeze.c b/src/Specific/solinas32_2e254m127x2e240m1/freeze.c
index 995145d52..7ddac88ba 100644
--- a/src/Specific/solinas32_2e254m127x2e240m1/freeze.c
+++ b/src/Specific/solinas32_2e254m127x2e240m1/freeze.c
@@ -21,7 +21,7 @@ static void freeze(uint32_t out[11], const uint32_t in1[11]) {
   { uint32_t x46, uint8_t x47 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x44, Return x18, 0x7fffff);
   { uint32_t x49, uint8_t x50 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x47, Return x20, 0x7fffff);
   { uint32_t x52, uint8_t x53 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x50, Return x19, 0x7f01ff);
-  { uint32_t x54 = (uint32_t)cmovznz(x53, 0x0, 0xffffffff);
+  { uint32_t x54 = cmovznz32(x53, 0x0, 0xffffffff);
   { uint32_t x55 = (x54 & 0xffffff);
   { uint32_t x57, uint8_t x58 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x22, Return x55);
   { uint32_t x59 = (x54 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e254m127x2e240m1/freezeDisplay.log b/src/Specific/solinas32_2e254m127x2e240m1/freezeDisplay.log
index 919dcd9cc..a181ddab4 100644
--- a/src/Specific/solinas32_2e254m127x2e240m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e254m127x2e240m1/freezeDisplay.log
@@ -13,7 +13,7 @@ Interp-η
  uint32_t x46, uint8_t x47 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x44, Return x18, 0x7fffff);
  uint32_t x49, uint8_t x50 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x47, Return x20, 0x7fffff);
  uint32_t x52, uint8_t x53 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x50, Return x19, 0x7f01ff);
- uint32_t x54 = (uint32_t)cmovznz(x53, 0x0, 0xffffffff);
+ uint32_t x54 = cmovznz32(x53, 0x0, 0xffffffff);
  uint32_t x55 = (x54 & 0xffffff);
  uint32_t x57, uint8_t x58 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x22, Return x55);
  uint32_t x59 = (x54 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e255m19/freeze.c b/src/Specific/solinas32_2e255m19/freeze.c
index a8e8fdb17..43d2310ed 100644
--- a/src/Specific/solinas32_2e255m19/freeze.c
+++ b/src/Specific/solinas32_2e255m19/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint32_t out[10], const uint32_t in1[10]) {
   { uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x1ffffff);
   { uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x3ffffff);
   { uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x1ffffff);
-  { uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+  { uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
   { uint32_t x50 = (x49 & 0x3ffffed);
   { uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint32_t x54 = (x49 & 0x1ffffff);
diff --git a/src/Specific/solinas32_2e255m19/freezeDisplay.log b/src/Specific/solinas32_2e255m19/freezeDisplay.log
index 1831379c8..b226eaf75 100644
--- a/src/Specific/solinas32_2e255m19/freezeDisplay.log
+++ b/src/Specific/solinas32_2e255m19/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint32_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x39, Return x16, 0x1ffffff);
  uint32_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x42, Return x18, 0x3ffffff);
  uint32_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x45, Return x17, 0x1ffffff);
- uint32_t x49 = (uint32_t)cmovznz(x48, 0x0, 0xffffffff);
+ uint32_t x49 = cmovznz32(x48, 0x0, 0xffffffff);
  uint32_t x50 = (x49 & 0x3ffffed);
  uint32_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint32_t x54 = (x49 & 0x1ffffff);
diff --git a/src/Specific/solinas32_2e255m2e4m2e1m1/freeze.c b/src/Specific/solinas32_2e255m2e4m2e1m1/freeze.c
index 92a207745..191f138aa 100644
--- a/src/Specific/solinas32_2e255m2e4m2e1m1/freeze.c
+++ b/src/Specific/solinas32_2e255m2e4m2e1m1/freeze.c
@@ -17,7 +17,7 @@ static void freeze(uint32_t out[9], const uint32_t in1[9]) {
   { uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x1fffffff);
   { uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0xfffffff);
   { uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0xfffffff);
-  { uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+  { uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
   { uint32_t x45 = (x44 & 0x1fffffed);
   { uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
   { uint32_t x49 = (x44 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e255m2e4m2e1m1/freezeDisplay.log b/src/Specific/solinas32_2e255m2e4m2e1m1/freezeDisplay.log
index f92d018a1..fe6c043eb 100644
--- a/src/Specific/solinas32_2e255m2e4m2e1m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e255m2e4m2e1m1/freezeDisplay.log
@@ -11,7 +11,7 @@ Interp-η
  uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x14, 0x1fffffff);
  uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x16, 0xfffffff);
  uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x15, 0xfffffff);
- uint32_t x44 = (uint32_t)cmovznz(x43, 0x0, 0xffffffff);
+ uint32_t x44 = cmovznz32(x43, 0x0, 0xffffffff);
  uint32_t x45 = (x44 & 0x1fffffed);
  uint32_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
  uint32_t x49 = (x44 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e255m765/freeze.c b/src/Specific/solinas32_2e255m765/freeze.c
index 998e47a88..8e245f5f1 100644
--- a/src/Specific/solinas32_2e255m765/freeze.c
+++ b/src/Specific/solinas32_2e255m765/freeze.c
@@ -23,7 +23,7 @@ static void freeze(uint32_t out[12], const uint32_t in1[12]) {
   { uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x1fffff);
   { uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1fffff);
   { uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1fffff);
-  { uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+  { uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
   { uint32_t x60 = (x59 & 0x3ffd03);
   { uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
   { uint32_t x64 = (x59 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e255m765/freezeDisplay.log b/src/Specific/solinas32_2e255m765/freezeDisplay.log
index dbe1909dd..49f69fa90 100644
--- a/src/Specific/solinas32_2e255m765/freezeDisplay.log
+++ b/src/Specific/solinas32_2e255m765/freezeDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x1fffff);
  uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1fffff);
  uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1fffff);
- uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+ uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
  uint32_t x60 = (x59 & 0x3ffd03);
  uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
  uint32_t x64 = (x59 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e256m189/freeze.c b/src/Specific/solinas32_2e256m189/freeze.c
index 72d762bc8..8731f955a 100644
--- a/src/Specific/solinas32_2e256m189/freeze.c
+++ b/src/Specific/solinas32_2e256m189/freeze.c
@@ -23,7 +23,7 @@ static void freeze(uint32_t out[12], const uint32_t in1[12]) {
   { uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x3fffff);
   { uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1fffff);
   { uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1fffff);
-  { uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+  { uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
   { uint32_t x60 = (x59 & 0x3fff43);
   { uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
   { uint32_t x64 = (x59 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e256m189/freezeDisplay.log b/src/Specific/solinas32_2e256m189/freezeDisplay.log
index fbba80b33..d225c3acc 100644
--- a/src/Specific/solinas32_2e256m189/freezeDisplay.log
+++ b/src/Specific/solinas32_2e256m189/freezeDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x3fffff);
  uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1fffff);
  uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1fffff);
- uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+ uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
  uint32_t x60 = (x59 & 0x3fff43);
  uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
  uint32_t x64 = (x59 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e256m2e224p2e192p2e96m1/freeze.c b/src/Specific/solinas32_2e256m2e224p2e192p2e96m1/freeze.c
index e0a528d67..bc4e44bea 100644
--- a/src/Specific/solinas32_2e256m2e224p2e192p2e96m1/freeze.c
+++ b/src/Specific/solinas32_2e256m2e224p2e192p2e96m1/freeze.c
@@ -23,7 +23,7 @@ static void freeze(uint32_t out[12], const uint32_t in1[12]) {
   { uint32_t x51, ℤ x52 = Op (Syntax.SubWithGetBorrow 22 Syntax.TZ (Syntax.TWord 5) (Syntax.TWord 3) (Syntax.TWord 5) Syntax.TZ) (Return x49, Return x20, 0x1);
   { uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 21 Syntax.TZ (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1ffc00);
   { uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1fffff);
-  { uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+  { uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
   { uint32_t x60 = (x59 & 0x3fffff);
   { uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
   { uint32_t x64 = (x59 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e256m2e224p2e192p2e96m1/freezeDisplay.log b/src/Specific/solinas32_2e256m2e224p2e192p2e96m1/freezeDisplay.log
index 6d96bc55a..78ec1d8c1 100644
--- a/src/Specific/solinas32_2e256m2e224p2e192p2e96m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e256m2e224p2e192p2e96m1/freezeDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint32_t x51, ℤ x52 = Op (Syntax.SubWithGetBorrow 22 Syntax.TZ (Syntax.TWord 5) (Syntax.TWord 3) (Syntax.TWord 5) Syntax.TZ) (Return x49, Return x20, 0x1);
  uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 21 Syntax.TZ (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1ffc00);
  uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1fffff);
- uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+ uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
  uint32_t x60 = (x59 & 0x3fffff);
  uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
  uint32_t x64 = (x59 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e256m2e32m977/freeze.c b/src/Specific/solinas32_2e256m2e32m977/freeze.c
index 38b518d28..ba45b0087 100644
--- a/src/Specific/solinas32_2e256m2e32m977/freeze.c
+++ b/src/Specific/solinas32_2e256m2e32m977/freeze.c
@@ -23,7 +23,7 @@ static void freeze(uint32_t out[12], const uint32_t in1[12]) {
   { uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x3fffff);
   { uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1fffff);
   { uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1fffff);
-  { uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+  { uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
   { uint32_t x60 = (x59 & 0x3ffc2f);
   { uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
   { uint32_t x64 = (x59 & 0x1ffbff);
diff --git a/src/Specific/solinas32_2e256m2e32m977/freezeDisplay.log b/src/Specific/solinas32_2e256m2e32m977/freezeDisplay.log
index fa67fe47f..5c4fc1a9a 100644
--- a/src/Specific/solinas32_2e256m2e32m977/freezeDisplay.log
+++ b/src/Specific/solinas32_2e256m2e32m977/freezeDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x3fffff);
  uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1fffff);
  uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1fffff);
- uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+ uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
  uint32_t x60 = (x59 & 0x3ffc2f);
  uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
  uint32_t x64 = (x59 & 0x1ffbff);
diff --git a/src/Specific/solinas32_2e256m88x2e240m1/freeze.c b/src/Specific/solinas32_2e256m88x2e240m1/freeze.c
index 704a289a8..1200bfd56 100644
--- a/src/Specific/solinas32_2e256m88x2e240m1/freeze.c
+++ b/src/Specific/solinas32_2e256m88x2e240m1/freeze.c
@@ -23,7 +23,7 @@ static void freeze(uint32_t out[12], const uint32_t in1[12]) {
   { uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x3fffff);
   { uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1fffff);
   { uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1ff4ff);
-  { uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+  { uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
   { uint32_t x60 = (x59 & 0x3fffff);
   { uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
   { uint32_t x64 = (x59 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e256m88x2e240m1/freezeDisplay.log b/src/Specific/solinas32_2e256m88x2e240m1/freezeDisplay.log
index c44e04cfc..5ad239064 100644
--- a/src/Specific/solinas32_2e256m88x2e240m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e256m88x2e240m1/freezeDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x3fffff);
  uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x1fffff);
  uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x1ff4ff);
- uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+ uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
  uint32_t x60 = (x59 & 0x3fffff);
  uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
  uint32_t x64 = (x59 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e266m3/freeze.c b/src/Specific/solinas32_2e266m3/freeze.c
index fa92594a0..800e80e41 100644
--- a/src/Specific/solinas32_2e266m3/freeze.c
+++ b/src/Specific/solinas32_2e266m3/freeze.c
@@ -23,7 +23,7 @@ static void freeze(uint32_t out[12], const uint32_t in1[12]) {
   { uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x3fffff);
   { uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x3fffff);
   { uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x3fffff);
-  { uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+  { uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
   { uint32_t x60 = (x59 & 0x7ffffd);
   { uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
   { uint32_t x64 = (x59 & 0x3fffff);
diff --git a/src/Specific/solinas32_2e266m3/freezeDisplay.log b/src/Specific/solinas32_2e266m3/freezeDisplay.log
index 0dae34bb9..7c05e0c4e 100644
--- a/src/Specific/solinas32_2e266m3/freezeDisplay.log
+++ b/src/Specific/solinas32_2e266m3/freezeDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x3fffff);
  uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x3fffff);
  uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x3fffff);
- uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+ uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
  uint32_t x60 = (x59 & 0x7ffffd);
  uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
  uint32_t x64 = (x59 & 0x3fffff);
diff --git a/src/Specific/solinas32_2e285m9/freeze.c b/src/Specific/solinas32_2e285m9/freeze.c
index afe1b2ee2..d709653ac 100644
--- a/src/Specific/solinas32_2e285m9/freeze.c
+++ b/src/Specific/solinas32_2e285m9/freeze.c
@@ -29,7 +29,7 @@ static void freeze(uint32_t out[15], const uint32_t in1[15]) {
   { uint32_t x66, uint8_t x67 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x64, Return x26, 0x7ffff);
   { uint32_t x69, uint8_t x70 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x67, Return x28, 0x7ffff);
   { uint32_t x72, uint8_t x73 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x70, Return x27, 0x7ffff);
-  { uint32_t x74 = (uint32_t)cmovznz(x73, 0x0, 0xffffffff);
+  { uint32_t x74 = cmovznz32(x73, 0x0, 0xffffffff);
   { uint32_t x75 = (x74 & 0x7fff7);
   { uint32_t x77, uint8_t x78 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x30, Return x75);
   { uint32_t x79 = (x74 & 0x7ffff);
diff --git a/src/Specific/solinas32_2e285m9/freezeDisplay.log b/src/Specific/solinas32_2e285m9/freezeDisplay.log
index c53807174..3fe017cfd 100644
--- a/src/Specific/solinas32_2e285m9/freezeDisplay.log
+++ b/src/Specific/solinas32_2e285m9/freezeDisplay.log
@@ -17,7 +17,7 @@ Interp-η
  uint32_t x66, uint8_t x67 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x64, Return x26, 0x7ffff);
  uint32_t x69, uint8_t x70 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x67, Return x28, 0x7ffff);
  uint32_t x72, uint8_t x73 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x70, Return x27, 0x7ffff);
- uint32_t x74 = (uint32_t)cmovznz(x73, 0x0, 0xffffffff);
+ uint32_t x74 = cmovznz32(x73, 0x0, 0xffffffff);
  uint32_t x75 = (x74 & 0x7fff7);
  uint32_t x77, uint8_t x78 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x30, Return x75);
  uint32_t x79 = (x74 & 0x7ffff);
diff --git a/src/Specific/solinas32_2e291m19/freeze.c b/src/Specific/solinas32_2e291m19/freeze.c
index a2c3a1c70..37a19b100 100644
--- a/src/Specific/solinas32_2e291m19/freeze.c
+++ b/src/Specific/solinas32_2e291m19/freeze.c
@@ -23,7 +23,7 @@ static void freeze(uint32_t out[12], const uint32_t in1[12]) {
   { uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0xffffff);
   { uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0xffffff);
   { uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0xffffff);
-  { uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+  { uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
   { uint32_t x60 = (x59 & 0x1ffffed);
   { uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
   { uint32_t x64 = (x59 & 0xffffff);
diff --git a/src/Specific/solinas32_2e291m19/freezeDisplay.log b/src/Specific/solinas32_2e291m19/freezeDisplay.log
index 32da3ea8d..ed2fe4cb7 100644
--- a/src/Specific/solinas32_2e291m19/freezeDisplay.log
+++ b/src/Specific/solinas32_2e291m19/freezeDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0xffffff);
  uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0xffffff);
  uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0xffffff);
- uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+ uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
  uint32_t x60 = (x59 & 0x1ffffed);
  uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
  uint32_t x64 = (x59 & 0xffffff);
diff --git a/src/Specific/solinas32_2e321m9/freeze.c b/src/Specific/solinas32_2e321m9/freeze.c
index 02edaa972..7b657b4d4 100644
--- a/src/Specific/solinas32_2e321m9/freeze.c
+++ b/src/Specific/solinas32_2e321m9/freeze.c
@@ -31,7 +31,7 @@ static void freeze(uint32_t out[16], const uint32_t in1[16]) {
   { uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xfffff);
   { uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xfffff);
   { uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xfffff);
-  { uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+  { uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
   { uint32_t x80 = (x79 & 0x1ffff7);
   { uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
   { uint32_t x84 = (x79 & 0xfffff);
diff --git a/src/Specific/solinas32_2e321m9/freezeDisplay.log b/src/Specific/solinas32_2e321m9/freezeDisplay.log
index 87c119a8c..3fcf89d1d 100644
--- a/src/Specific/solinas32_2e321m9/freezeDisplay.log
+++ b/src/Specific/solinas32_2e321m9/freezeDisplay.log
@@ -18,7 +18,7 @@ Interp-η
  uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xfffff);
  uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xfffff);
  uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xfffff);
- uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+ uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
  uint32_t x80 = (x79 & 0x1ffff7);
  uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
  uint32_t x84 = (x79 & 0xfffff);
diff --git a/src/Specific/solinas32_2e322m2e161m1/freeze.c b/src/Specific/solinas32_2e322m2e161m1/freeze.c
index 744989782..3e2f2b671 100644
--- a/src/Specific/solinas32_2e322m2e161m1/freeze.c
+++ b/src/Specific/solinas32_2e322m2e161m1/freeze.c
@@ -27,7 +27,7 @@ static void freeze(uint32_t out[14], const uint32_t in1[14]) {
   { uint32_t x61, uint8_t x62 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x59, Return x24, 0x7fffff);
   { uint32_t x64, uint8_t x65 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x62, Return x26, 0x7fffff);
   { uint32_t x67, uint8_t x68 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x65, Return x25, 0x7fffff);
-  { uint32_t x69 = (uint32_t)cmovznz(x68, 0x0, 0xffffffff);
+  { uint32_t x69 = cmovznz32(x68, 0x0, 0xffffffff);
   { uint32_t x70 = (x69 & 0x7fffff);
   { uint32_t x72, uint8_t x73 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x28, Return x70);
   { uint32_t x74 = (x69 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e322m2e161m1/freezeDisplay.log b/src/Specific/solinas32_2e322m2e161m1/freezeDisplay.log
index f41f9ced4..5769da713 100644
--- a/src/Specific/solinas32_2e322m2e161m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e322m2e161m1/freezeDisplay.log
@@ -16,7 +16,7 @@ Interp-η
  uint32_t x61, uint8_t x62 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x59, Return x24, 0x7fffff);
  uint32_t x64, uint8_t x65 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x62, Return x26, 0x7fffff);
  uint32_t x67, uint8_t x68 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x65, Return x25, 0x7fffff);
- uint32_t x69 = (uint32_t)cmovznz(x68, 0x0, 0xffffffff);
+ uint32_t x69 = cmovznz32(x68, 0x0, 0xffffffff);
  uint32_t x70 = (x69 & 0x7fffff);
  uint32_t x72, uint8_t x73 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x28, Return x70);
  uint32_t x74 = (x69 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e336m17/freeze.c b/src/Specific/solinas32_2e336m17/freeze.c
index 6e1ed8a8f..2d7a3f5f0 100644
--- a/src/Specific/solinas32_2e336m17/freeze.c
+++ b/src/Specific/solinas32_2e336m17/freeze.c
@@ -27,7 +27,7 @@ static void freeze(uint32_t out[14], const uint32_t in1[14]) {
   { uint32_t x61, uint8_t x62 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x59, Return x24, 0xffffff);
   { uint32_t x64, uint8_t x65 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x62, Return x26, 0xffffff);
   { uint32_t x67, uint8_t x68 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x65, Return x25, 0xffffff);
-  { uint32_t x69 = (uint32_t)cmovznz(x68, 0x0, 0xffffffff);
+  { uint32_t x69 = cmovznz32(x68, 0x0, 0xffffffff);
   { uint32_t x70 = (x69 & 0xffffef);
   { uint32_t x72, uint8_t x73 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x28, Return x70);
   { uint32_t x74 = (x69 & 0xffffff);
diff --git a/src/Specific/solinas32_2e336m17/freezeDisplay.log b/src/Specific/solinas32_2e336m17/freezeDisplay.log
index 6ddcce0a9..17b8867bb 100644
--- a/src/Specific/solinas32_2e336m17/freezeDisplay.log
+++ b/src/Specific/solinas32_2e336m17/freezeDisplay.log
@@ -16,7 +16,7 @@ Interp-η
  uint32_t x61, uint8_t x62 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x59, Return x24, 0xffffff);
  uint32_t x64, uint8_t x65 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x62, Return x26, 0xffffff);
  uint32_t x67, uint8_t x68 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x65, Return x25, 0xffffff);
- uint32_t x69 = (uint32_t)cmovznz(x68, 0x0, 0xffffffff);
+ uint32_t x69 = cmovznz32(x68, 0x0, 0xffffffff);
  uint32_t x70 = (x69 & 0xffffef);
  uint32_t x72, uint8_t x73 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x28, Return x70);
  uint32_t x74 = (x69 & 0xffffff);
diff --git a/src/Specific/solinas32_2e336m3/freeze.c b/src/Specific/solinas32_2e336m3/freeze.c
index 7a8107542..321731d94 100644
--- a/src/Specific/solinas32_2e336m3/freeze.c
+++ b/src/Specific/solinas32_2e336m3/freeze.c
@@ -23,7 +23,7 @@ static void freeze(uint32_t out[12], const uint32_t in1[12]) {
   { uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0xfffffff);
   { uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0xfffffff);
   { uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0xfffffff);
-  { uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+  { uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
   { uint32_t x60 = (x59 & 0xffffffd);
   { uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
   { uint32_t x64 = (x59 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e336m3/freezeDisplay.log b/src/Specific/solinas32_2e336m3/freezeDisplay.log
index 8a9bf70d5..8b4f4961f 100644
--- a/src/Specific/solinas32_2e336m3/freezeDisplay.log
+++ b/src/Specific/solinas32_2e336m3/freezeDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0xfffffff);
  uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0xfffffff);
  uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0xfffffff);
- uint32_t x59 = (uint32_t)cmovznz(x58, 0x0, 0xffffffff);
+ uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
  uint32_t x60 = (x59 & 0xffffffd);
  uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
  uint32_t x64 = (x59 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e338m15/freeze.c b/src/Specific/solinas32_2e338m15/freeze.c
index adc3007f2..a37f312b1 100644
--- a/src/Specific/solinas32_2e338m15/freeze.c
+++ b/src/Specific/solinas32_2e338m15/freeze.c
@@ -25,7 +25,7 @@ static void freeze(uint32_t out[13], const uint32_t in1[13]) {
   { uint32_t x56, uint8_t x57 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x54, Return x22, 0x3ffffff);
   { uint32_t x59, uint8_t x60 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x57, Return x24, 0x3ffffff);
   { uint32_t x62, uint8_t x63 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x60, Return x23, 0x3ffffff);
-  { uint32_t x64 = (uint32_t)cmovznz(x63, 0x0, 0xffffffff);
+  { uint32_t x64 = cmovznz32(x63, 0x0, 0xffffffff);
   { uint32_t x65 = (x64 & 0x3fffff1);
   { uint32_t x67, uint8_t x68 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x26, Return x65);
   { uint32_t x69 = (x64 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e338m15/freezeDisplay.log b/src/Specific/solinas32_2e338m15/freezeDisplay.log
index 448bad4ce..8f8255a0d 100644
--- a/src/Specific/solinas32_2e338m15/freezeDisplay.log
+++ b/src/Specific/solinas32_2e338m15/freezeDisplay.log
@@ -15,7 +15,7 @@ Interp-η
  uint32_t x56, uint8_t x57 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x54, Return x22, 0x3ffffff);
  uint32_t x59, uint8_t x60 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x57, Return x24, 0x3ffffff);
  uint32_t x62, uint8_t x63 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x60, Return x23, 0x3ffffff);
- uint32_t x64 = (uint32_t)cmovznz(x63, 0x0, 0xffffffff);
+ uint32_t x64 = cmovznz32(x63, 0x0, 0xffffffff);
  uint32_t x65 = (x64 & 0x3fffff1);
  uint32_t x67, uint8_t x68 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x26, Return x65);
  uint32_t x69 = (x64 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e369m25/freeze.c b/src/Specific/solinas32_2e369m25/freeze.c
index 15926bf76..9e69a5b92 100644
--- a/src/Specific/solinas32_2e369m25/freeze.c
+++ b/src/Specific/solinas32_2e369m25/freeze.c
@@ -31,7 +31,7 @@ static void freeze(uint32_t out[16], const uint32_t in1[16]) {
   { uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0x7fffff);
   { uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0x7fffff);
   { uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0x7fffff);
-  { uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+  { uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
   { uint32_t x80 = (x79 & 0xffffe7);
   { uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
   { uint32_t x84 = (x79 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e369m25/freezeDisplay.log b/src/Specific/solinas32_2e369m25/freezeDisplay.log
index ecff7c235..8bf6ce780 100644
--- a/src/Specific/solinas32_2e369m25/freezeDisplay.log
+++ b/src/Specific/solinas32_2e369m25/freezeDisplay.log
@@ -18,7 +18,7 @@ Interp-η
  uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0x7fffff);
  uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0x7fffff);
  uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0x7fffff);
- uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+ uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
  uint32_t x80 = (x79 & 0xffffe7);
  uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
  uint32_t x84 = (x79 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e379m19/freeze.c b/src/Specific/solinas32_2e379m19/freeze.c
index c49799164..e4e38d504 100644
--- a/src/Specific/solinas32_2e379m19/freeze.c
+++ b/src/Specific/solinas32_2e379m19/freeze.c
@@ -35,7 +35,7 @@ static void freeze(uint32_t out[18], const uint32_t in1[18]) {
   { uint32_t x81, uint8_t x82 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x79, Return x32, 0x1fffff);
   { uint32_t x84, uint8_t x85 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x82, Return x34, 0x1fffff);
   { uint32_t x87, uint8_t x88 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x85, Return x33, 0x1fffff);
-  { uint32_t x89 = (uint32_t)cmovznz(x88, 0x0, 0xffffffff);
+  { uint32_t x89 = cmovznz32(x88, 0x0, 0xffffffff);
   { uint32_t x90 = (x89 & 0x3fffed);
   { uint32_t x92, uint8_t x93 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x36, Return x90);
   { uint32_t x94 = (x89 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e379m19/freezeDisplay.log b/src/Specific/solinas32_2e379m19/freezeDisplay.log
index 061ac0605..f0163aa1d 100644
--- a/src/Specific/solinas32_2e379m19/freezeDisplay.log
+++ b/src/Specific/solinas32_2e379m19/freezeDisplay.log
@@ -20,7 +20,7 @@ Interp-η
  uint32_t x81, uint8_t x82 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x79, Return x32, 0x1fffff);
  uint32_t x84, uint8_t x85 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x82, Return x34, 0x1fffff);
  uint32_t x87, uint8_t x88 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x85, Return x33, 0x1fffff);
- uint32_t x89 = (uint32_t)cmovznz(x88, 0x0, 0xffffffff);
+ uint32_t x89 = cmovznz32(x88, 0x0, 0xffffffff);
  uint32_t x90 = (x89 & 0x3fffed);
  uint32_t x92, uint8_t x93 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x36, Return x90);
  uint32_t x94 = (x89 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e382m105/freeze.c b/src/Specific/solinas32_2e382m105/freeze.c
index bd0a21ae9..2303c7d53 100644
--- a/src/Specific/solinas32_2e382m105/freeze.c
+++ b/src/Specific/solinas32_2e382m105/freeze.c
@@ -39,7 +39,7 @@ static void freeze(uint32_t out[20], const uint32_t in1[20]) {
   { uint32_t x91, uint8_t x92 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x89, Return x36, 0x7ffff);
   { uint32_t x94, uint8_t x95 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x92, Return x38, 0x7ffff);
   { uint32_t x97, uint8_t x98 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x95, Return x37, 0x7ffff);
-  { uint32_t x99 = (uint32_t)cmovznz(x98, 0x0, 0xffffffff);
+  { uint32_t x99 = cmovznz32(x98, 0x0, 0xffffffff);
   { uint32_t x100 = (x99 & 0xfff97);
   { uint32_t x102, uint8_t x103 = Op (Syntax.AddWithGetCarry 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x40, Return x100);
   { uint32_t x104 = (x99 & 0x7ffff);
diff --git a/src/Specific/solinas32_2e382m105/freezeDisplay.log b/src/Specific/solinas32_2e382m105/freezeDisplay.log
index b697cc471..f850575b6 100644
--- a/src/Specific/solinas32_2e382m105/freezeDisplay.log
+++ b/src/Specific/solinas32_2e382m105/freezeDisplay.log
@@ -22,7 +22,7 @@ Interp-η
  uint32_t x91, uint8_t x92 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x89, Return x36, 0x7ffff);
  uint32_t x94, uint8_t x95 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x92, Return x38, 0x7ffff);
  uint32_t x97, uint8_t x98 = Op (Syntax.SubWithGetBorrow 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x95, Return x37, 0x7ffff);
- uint32_t x99 = (uint32_t)cmovznz(x98, 0x0, 0xffffffff);
+ uint32_t x99 = cmovznz32(x98, 0x0, 0xffffffff);
  uint32_t x100 = (x99 & 0xfff97);
  uint32_t x102, uint8_t x103 = Op (Syntax.AddWithGetCarry 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x40, Return x100);
  uint32_t x104 = (x99 & 0x7ffff);
diff --git a/src/Specific/solinas32_2e384m2e128m2e96p2e32m1/freeze.c b/src/Specific/solinas32_2e384m2e128m2e96p2e32m1/freeze.c
index b11fdca42..306c3193f 100644
--- a/src/Specific/solinas32_2e384m2e128m2e96p2e32m1/freeze.c
+++ b/src/Specific/solinas32_2e384m2e128m2e96p2e32m1/freeze.c
@@ -31,7 +31,7 @@ static void freeze(uint32_t out[16], const uint32_t in1[16]) {
   { uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xffffff);
   { uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xffffff);
   { uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xffffff);
-  { uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+  { uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
   { uint32_t x80 = (x79 & 0xffffff);
   { uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
   { uint8_t x84 = ((uint8_t)x79 & 0xff);
diff --git a/src/Specific/solinas32_2e384m2e128m2e96p2e32m1/freezeDisplay.log b/src/Specific/solinas32_2e384m2e128m2e96p2e32m1/freezeDisplay.log
index d5dad97fa..266b592f9 100644
--- a/src/Specific/solinas32_2e384m2e128m2e96p2e32m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e384m2e128m2e96p2e32m1/freezeDisplay.log
@@ -18,7 +18,7 @@ Interp-η
  uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xffffff);
  uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xffffff);
  uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xffffff);
- uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+ uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
  uint32_t x80 = (x79 & 0xffffff);
  uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
  uint8_t x84 = ((uint8_t)x79 & 0xff);
diff --git a/src/Specific/solinas32_2e384m317/freeze.c b/src/Specific/solinas32_2e384m317/freeze.c
index 3fddc66f2..3f87099f2 100644
--- a/src/Specific/solinas32_2e384m317/freeze.c
+++ b/src/Specific/solinas32_2e384m317/freeze.c
@@ -35,7 +35,7 @@ static void freeze(uint32_t out[18], const uint32_t in1[18]) {
   { uint32_t x81, uint8_t x82 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x79, Return x32, 0x3fffff);
   { uint32_t x84, uint8_t x85 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x82, Return x34, 0x1fffff);
   { uint32_t x87, uint8_t x88 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x85, Return x33, 0x1fffff);
-  { uint32_t x89 = (uint32_t)cmovznz(x88, 0x0, 0xffffffff);
+  { uint32_t x89 = cmovznz32(x88, 0x0, 0xffffffff);
   { uint32_t x90 = (x89 & 0x3ffec3);
   { uint32_t x92, uint8_t x93 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x36, Return x90);
   { uint32_t x94 = (x89 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e384m317/freezeDisplay.log b/src/Specific/solinas32_2e384m317/freezeDisplay.log
index 595880b7e..c508179d4 100644
--- a/src/Specific/solinas32_2e384m317/freezeDisplay.log
+++ b/src/Specific/solinas32_2e384m317/freezeDisplay.log
@@ -20,7 +20,7 @@ Interp-η
  uint32_t x81, uint8_t x82 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x79, Return x32, 0x3fffff);
  uint32_t x84, uint8_t x85 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x82, Return x34, 0x1fffff);
  uint32_t x87, uint8_t x88 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x85, Return x33, 0x1fffff);
- uint32_t x89 = (uint32_t)cmovznz(x88, 0x0, 0xffffffff);
+ uint32_t x89 = cmovznz32(x88, 0x0, 0xffffffff);
  uint32_t x90 = (x89 & 0x3ffec3);
  uint32_t x92, uint8_t x93 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x36, Return x90);
  uint32_t x94 = (x89 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e384m5x2e368m1/freeze.c b/src/Specific/solinas32_2e384m5x2e368m1/freeze.c
index 6e58bd525..70dc3411f 100644
--- a/src/Specific/solinas32_2e384m5x2e368m1/freeze.c
+++ b/src/Specific/solinas32_2e384m5x2e368m1/freeze.c
@@ -31,7 +31,7 @@ static void freeze(uint32_t out[16], const uint32_t in1[16]) {
   { uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xffffff);
   { uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xffffff);
   { uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xfffaff);
-  { uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+  { uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
   { uint32_t x80 = (x79 & 0xffffff);
   { uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
   { uint32_t x84 = (x79 & 0xffffff);
diff --git a/src/Specific/solinas32_2e384m5x2e368m1/freezeDisplay.log b/src/Specific/solinas32_2e384m5x2e368m1/freezeDisplay.log
index 6f21cff93..0e6d925e1 100644
--- a/src/Specific/solinas32_2e384m5x2e368m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e384m5x2e368m1/freezeDisplay.log
@@ -18,7 +18,7 @@ Interp-η
  uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xffffff);
  uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xffffff);
  uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xfffaff);
- uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+ uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
  uint32_t x80 = (x79 & 0xffffff);
  uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
  uint32_t x84 = (x79 & 0xffffff);
diff --git a/src/Specific/solinas32_2e384m79x2e376m1/freeze.c b/src/Specific/solinas32_2e384m79x2e376m1/freeze.c
index 3f29d8d5c..19d33591c 100644
--- a/src/Specific/solinas32_2e384m79x2e376m1/freeze.c
+++ b/src/Specific/solinas32_2e384m79x2e376m1/freeze.c
@@ -31,7 +31,7 @@ static void freeze(uint32_t out[16], const uint32_t in1[16]) {
   { uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xffffff);
   { uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xffffff);
   { uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xb0ffff);
-  { uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+  { uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
   { uint32_t x80 = (x79 & 0xffffff);
   { uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
   { uint32_t x84 = (x79 & 0xffffff);
diff --git a/src/Specific/solinas32_2e384m79x2e376m1/freezeDisplay.log b/src/Specific/solinas32_2e384m79x2e376m1/freezeDisplay.log
index 7ca8a9fcf..f85cdc2fb 100644
--- a/src/Specific/solinas32_2e384m79x2e376m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e384m79x2e376m1/freezeDisplay.log
@@ -18,7 +18,7 @@ Interp-η
  uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xffffff);
  uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xffffff);
  uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xb0ffff);
- uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+ uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
  uint32_t x80 = (x79 & 0xffffff);
  uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 24 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
  uint32_t x84 = (x79 & 0xffffff);
diff --git a/src/Specific/solinas32_2e401m31/freeze.c b/src/Specific/solinas32_2e401m31/freeze.c
index 2bc686d96..afca43fcc 100644
--- a/src/Specific/solinas32_2e401m31/freeze.c
+++ b/src/Specific/solinas32_2e401m31/freeze.c
@@ -31,7 +31,7 @@ static void freeze(uint32_t out[16], const uint32_t in1[16]) {
   { uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0x1ffffff);
   { uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0x1ffffff);
   { uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0x1ffffff);
-  { uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+  { uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
   { uint32_t x80 = (x79 & 0x3ffffe1);
   { uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
   { uint32_t x84 = (x79 & 0x1ffffff);
diff --git a/src/Specific/solinas32_2e401m31/freezeDisplay.log b/src/Specific/solinas32_2e401m31/freezeDisplay.log
index c3bc3bec7..a0de7633b 100644
--- a/src/Specific/solinas32_2e401m31/freezeDisplay.log
+++ b/src/Specific/solinas32_2e401m31/freezeDisplay.log
@@ -18,7 +18,7 @@ Interp-η
  uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0x1ffffff);
  uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0x1ffffff);
  uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 25 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0x1ffffff);
- uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+ uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
  uint32_t x80 = (x79 & 0x3ffffe1);
  uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
  uint32_t x84 = (x79 & 0x1ffffff);
diff --git a/src/Specific/solinas32_2e414m17/freeze.c b/src/Specific/solinas32_2e414m17/freeze.c
index bf8aaea86..ad6b277df 100644
--- a/src/Specific/solinas32_2e414m17/freeze.c
+++ b/src/Specific/solinas32_2e414m17/freeze.c
@@ -35,7 +35,7 @@ static void freeze(uint32_t out[18], const uint32_t in1[18]) {
   { uint32_t x81, uint8_t x82 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x79, Return x32, 0x7fffff);
   { uint32_t x84, uint8_t x85 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x82, Return x34, 0x7fffff);
   { uint32_t x87, uint8_t x88 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x85, Return x33, 0x7fffff);
-  { uint32_t x89 = (uint32_t)cmovznz(x88, 0x0, 0xffffffff);
+  { uint32_t x89 = cmovznz32(x88, 0x0, 0xffffffff);
   { uint32_t x90 = (x89 & 0x7fffef);
   { uint32_t x92, uint8_t x93 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x36, Return x90);
   { uint32_t x94 = (x89 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e414m17/freezeDisplay.log b/src/Specific/solinas32_2e414m17/freezeDisplay.log
index 8f274ca76..9e1c90b7b 100644
--- a/src/Specific/solinas32_2e414m17/freezeDisplay.log
+++ b/src/Specific/solinas32_2e414m17/freezeDisplay.log
@@ -20,7 +20,7 @@ Interp-η
  uint32_t x81, uint8_t x82 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x79, Return x32, 0x7fffff);
  uint32_t x84, uint8_t x85 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x82, Return x34, 0x7fffff);
  uint32_t x87, uint8_t x88 = Op (Syntax.SubWithGetBorrow 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x85, Return x33, 0x7fffff);
- uint32_t x89 = (uint32_t)cmovznz(x88, 0x0, 0xffffffff);
+ uint32_t x89 = cmovznz32(x88, 0x0, 0xffffffff);
  uint32_t x90 = (x89 & 0x7fffef);
  uint32_t x92, uint8_t x93 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x36, Return x90);
  uint32_t x94 = (x89 & 0x7fffff);
diff --git a/src/Specific/solinas32_2e416m2e208m1/freeze.c b/src/Specific/solinas32_2e416m2e208m1/freeze.c
index 686158a18..ae9d0fc2e 100644
--- a/src/Specific/solinas32_2e416m2e208m1/freeze.c
+++ b/src/Specific/solinas32_2e416m2e208m1/freeze.c
@@ -31,7 +31,7 @@ static void freeze(uint32_t out[16], const uint32_t in1[16]) {
   { uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0x3ffffff);
   { uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0x3ffffff);
   { uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0x3ffffff);
-  { uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+  { uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
   { uint32_t x80 = (x79 & 0x3ffffff);
   { uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
   { uint32_t x84 = (x79 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e416m2e208m1/freezeDisplay.log b/src/Specific/solinas32_2e416m2e208m1/freezeDisplay.log
index 58a5111f0..22cb7e523 100644
--- a/src/Specific/solinas32_2e416m2e208m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e416m2e208m1/freezeDisplay.log
@@ -18,7 +18,7 @@ Interp-η
  uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0x3ffffff);
  uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0x3ffffff);
  uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0x3ffffff);
- uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+ uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
  uint32_t x80 = (x79 & 0x3ffffff);
  uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
  uint32_t x84 = (x79 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e444m17/freeze.c b/src/Specific/solinas32_2e444m17/freeze.c
index 9736dd106..b9cb08cbc 100644
--- a/src/Specific/solinas32_2e444m17/freeze.c
+++ b/src/Specific/solinas32_2e444m17/freeze.c
@@ -39,7 +39,7 @@ static void freeze(uint32_t out[20], const uint32_t in1[20]) {
   { uint32_t x91, uint8_t x92 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x89, Return x36, 0x3fffff);
   { uint32_t x94, uint8_t x95 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x92, Return x38, 0x3fffff);
   { uint32_t x97, uint8_t x98 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x95, Return x37, 0x3fffff);
-  { uint32_t x99 = (uint32_t)cmovznz(x98, 0x0, 0xffffffff);
+  { uint32_t x99 = cmovznz32(x98, 0x0, 0xffffffff);
   { uint32_t x100 = (x99 & 0x7fffef);
   { uint32_t x102, uint8_t x103 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x40, Return x100);
   { uint32_t x104 = (x99 & 0x3fffff);
diff --git a/src/Specific/solinas32_2e444m17/freezeDisplay.log b/src/Specific/solinas32_2e444m17/freezeDisplay.log
index b53071a70..ff788d663 100644
--- a/src/Specific/solinas32_2e444m17/freezeDisplay.log
+++ b/src/Specific/solinas32_2e444m17/freezeDisplay.log
@@ -22,7 +22,7 @@ Interp-η
  uint32_t x91, uint8_t x92 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x89, Return x36, 0x3fffff);
  uint32_t x94, uint8_t x95 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x92, Return x38, 0x3fffff);
  uint32_t x97, uint8_t x98 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x95, Return x37, 0x3fffff);
- uint32_t x99 = (uint32_t)cmovznz(x98, 0x0, 0xffffffff);
+ uint32_t x99 = cmovznz32(x98, 0x0, 0xffffffff);
  uint32_t x100 = (x99 & 0x7fffef);
  uint32_t x102, uint8_t x103 = Op (Syntax.AddWithGetCarry 23 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x40, Return x100);
  uint32_t x104 = (x99 & 0x3fffff);
diff --git a/src/Specific/solinas32_2e448m2e224m1/freeze.c b/src/Specific/solinas32_2e448m2e224m1/freeze.c
index 9077bb4bd..0763e4c18 100644
--- a/src/Specific/solinas32_2e448m2e224m1/freeze.c
+++ b/src/Specific/solinas32_2e448m2e224m1/freeze.c
@@ -31,7 +31,7 @@ static void freeze(uint32_t out[16], const uint32_t in1[16]) {
   { uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xfffffff);
   { uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xfffffff);
   { uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xfffffff);
-  { uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+  { uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
   { uint32_t x80 = (x79 & 0xfffffff);
   { uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
   { uint32_t x84 = (x79 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e448m2e224m1/freezeDisplay.log b/src/Specific/solinas32_2e448m2e224m1/freezeDisplay.log
index 25a7c1346..bf5bf0738 100644
--- a/src/Specific/solinas32_2e448m2e224m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e448m2e224m1/freezeDisplay.log
@@ -18,7 +18,7 @@ Interp-η
  uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xfffffff);
  uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xfffffff);
  uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xfffffff);
- uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+ uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
  uint32_t x80 = (x79 & 0xfffffff);
  uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
  uint32_t x84 = (x79 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e450m2e225m1/freeze.c b/src/Specific/solinas32_2e450m2e225m1/freeze.c
index 66e75b139..23dc8d036 100644
--- a/src/Specific/solinas32_2e450m2e225m1/freeze.c
+++ b/src/Specific/solinas32_2e450m2e225m1/freeze.c
@@ -29,7 +29,7 @@ static void freeze(uint32_t out[15], const uint32_t in1[15]) {
   { uint32_t x66, uint8_t x67 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x64, Return x26, 0x3fffffff);
   { uint32_t x69, uint8_t x70 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x67, Return x28, 0x3fffffff);
   { uint32_t x72, uint8_t x73 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x70, Return x27, 0x3fffffff);
-  { uint32_t x74 = (uint32_t)cmovznz(x73, 0x0, 0xffffffff);
+  { uint32_t x74 = cmovznz32(x73, 0x0, 0xffffffff);
   { uint32_t x75 = (x74 & 0x3fffffff);
   { uint32_t x77, uint8_t x78 = Op (Syntax.AddWithGetCarry 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x30, Return x75);
   { uint32_t x79 = (x74 & 0x3fffffff);
diff --git a/src/Specific/solinas32_2e450m2e225m1/freezeDisplay.log b/src/Specific/solinas32_2e450m2e225m1/freezeDisplay.log
index 4022639c0..21b0031fb 100644
--- a/src/Specific/solinas32_2e450m2e225m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e450m2e225m1/freezeDisplay.log
@@ -17,7 +17,7 @@ Interp-η
  uint32_t x66, uint8_t x67 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x64, Return x26, 0x3fffffff);
  uint32_t x69, uint8_t x70 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x67, Return x28, 0x3fffffff);
  uint32_t x72, uint8_t x73 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x70, Return x27, 0x3fffffff);
- uint32_t x74 = (uint32_t)cmovznz(x73, 0x0, 0xffffffff);
+ uint32_t x74 = cmovznz32(x73, 0x0, 0xffffffff);
  uint32_t x75 = (x74 & 0x3fffffff);
  uint32_t x77, uint8_t x78 = Op (Syntax.AddWithGetCarry 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x30, Return x75);
  uint32_t x79 = (x74 & 0x3fffffff);
diff --git a/src/Specific/solinas32_2e452m3/freeze.c b/src/Specific/solinas32_2e452m3/freeze.c
index aefe4819b..7500bc98d 100644
--- a/src/Specific/solinas32_2e452m3/freeze.c
+++ b/src/Specific/solinas32_2e452m3/freeze.c
@@ -31,7 +31,7 @@ static void freeze(uint32_t out[16], const uint32_t in1[16]) {
   { uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xfffffff);
   { uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xfffffff);
   { uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xfffffff);
-  { uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+  { uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
   { uint32_t x80 = (x79 & 0x1ffffffd);
   { uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
   { uint32_t x84 = (x79 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e452m3/freezeDisplay.log b/src/Specific/solinas32_2e452m3/freezeDisplay.log
index 07e0cb10a..1f5c90e82 100644
--- a/src/Specific/solinas32_2e452m3/freezeDisplay.log
+++ b/src/Specific/solinas32_2e452m3/freezeDisplay.log
@@ -18,7 +18,7 @@ Interp-η
  uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0xfffffff);
  uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0xfffffff);
  uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 28 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0xfffffff);
- uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+ uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
  uint32_t x80 = (x79 & 0x1ffffffd);
  uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 29 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
  uint32_t x84 = (x79 & 0xfffffff);
diff --git a/src/Specific/solinas32_2e468m17/freeze.c b/src/Specific/solinas32_2e468m17/freeze.c
index 575427345..625fba05e 100644
--- a/src/Specific/solinas32_2e468m17/freeze.c
+++ b/src/Specific/solinas32_2e468m17/freeze.c
@@ -35,7 +35,7 @@ static void freeze(uint32_t out[18], const uint32_t in1[18]) {
   { uint32_t x81, uint8_t x82 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x79, Return x32, 0x3ffffff);
   { uint32_t x84, uint8_t x85 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x82, Return x34, 0x3ffffff);
   { uint32_t x87, uint8_t x88 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x85, Return x33, 0x3ffffff);
-  { uint32_t x89 = (uint32_t)cmovznz(x88, 0x0, 0xffffffff);
+  { uint32_t x89 = cmovznz32(x88, 0x0, 0xffffffff);
   { uint32_t x90 = (x89 & 0x3ffffef);
   { uint32_t x92, uint8_t x93 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x36, Return x90);
   { uint32_t x94 = (x89 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e468m17/freezeDisplay.log b/src/Specific/solinas32_2e468m17/freezeDisplay.log
index 3d85339ec..b2480f2df 100644
--- a/src/Specific/solinas32_2e468m17/freezeDisplay.log
+++ b/src/Specific/solinas32_2e468m17/freezeDisplay.log
@@ -20,7 +20,7 @@ Interp-η
  uint32_t x81, uint8_t x82 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x79, Return x32, 0x3ffffff);
  uint32_t x84, uint8_t x85 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x82, Return x34, 0x3ffffff);
  uint32_t x87, uint8_t x88 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x85, Return x33, 0x3ffffff);
- uint32_t x89 = (uint32_t)cmovznz(x88, 0x0, 0xffffffff);
+ uint32_t x89 = cmovznz32(x88, 0x0, 0xffffffff);
  uint32_t x90 = (x89 & 0x3ffffef);
  uint32_t x92, uint8_t x93 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x36, Return x90);
  uint32_t x94 = (x89 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e480m2e240m1/freeze.c b/src/Specific/solinas32_2e480m2e240m1/freeze.c
index 8d6e8e351..df4f2391f 100644
--- a/src/Specific/solinas32_2e480m2e240m1/freeze.c
+++ b/src/Specific/solinas32_2e480m2e240m1/freeze.c
@@ -31,7 +31,7 @@ static void freeze(uint32_t out[16], const uint32_t in1[16]) {
   { uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0x3fffffff);
   { uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0x3fffffff);
   { uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0x3fffffff);
-  { uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+  { uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
   { uint32_t x80 = (x79 & 0x3fffffff);
   { uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
   { uint32_t x84 = (x79 & 0x3fffffff);
diff --git a/src/Specific/solinas32_2e480m2e240m1/freezeDisplay.log b/src/Specific/solinas32_2e480m2e240m1/freezeDisplay.log
index b3f3cf7e7..b977f19cf 100644
--- a/src/Specific/solinas32_2e480m2e240m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e480m2e240m1/freezeDisplay.log
@@ -18,7 +18,7 @@ Interp-η
  uint32_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x69, Return x28, 0x3fffffff);
  uint32_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x72, Return x30, 0x3fffffff);
  uint32_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x29, 0x3fffffff);
- uint32_t x79 = (uint32_t)cmovznz(x78, 0x0, 0xffffffff);
+ uint32_t x79 = cmovznz32(x78, 0x0, 0xffffffff);
  uint32_t x80 = (x79 & 0x3fffffff);
  uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 30 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
  uint32_t x84 = (x79 & 0x3fffffff);
diff --git a/src/Specific/solinas32_2e488m17/freeze.c b/src/Specific/solinas32_2e488m17/freeze.c
index c5d193deb..b94faeff8 100644
--- a/src/Specific/solinas32_2e488m17/freeze.c
+++ b/src/Specific/solinas32_2e488m17/freeze.c
@@ -47,7 +47,7 @@ static void freeze(uint32_t out[24], const uint32_t in1[24]) {
   { uint32_t x111, uint8_t x112 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x109, Return x44, 0x1fffff);
   { uint32_t x114, uint8_t x115 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x112, Return x46, 0xfffff);
   { uint32_t x117, uint8_t x118 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x115, Return x45, 0xfffff);
-  { uint32_t x119 = (uint32_t)cmovznz(x118, 0x0, 0xffffffff);
+  { uint32_t x119 = cmovznz32(x118, 0x0, 0xffffffff);
   { uint32_t x120 = (x119 & 0x1fffef);
   { uint32_t x122, uint8_t x123 = Op (Syntax.AddWithGetCarry 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x48, Return x120);
   { uint32_t x124 = (x119 & 0xfffff);
diff --git a/src/Specific/solinas32_2e488m17/freezeDisplay.log b/src/Specific/solinas32_2e488m17/freezeDisplay.log
index ebccdb577..6cc31bd4e 100644
--- a/src/Specific/solinas32_2e488m17/freezeDisplay.log
+++ b/src/Specific/solinas32_2e488m17/freezeDisplay.log
@@ -26,7 +26,7 @@ Interp-η
  uint32_t x111, uint8_t x112 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x109, Return x44, 0x1fffff);
  uint32_t x114, uint8_t x115 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x112, Return x46, 0xfffff);
  uint32_t x117, uint8_t x118 = Op (Syntax.SubWithGetBorrow 20 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x115, Return x45, 0xfffff);
- uint32_t x119 = (uint32_t)cmovznz(x118, 0x0, 0xffffffff);
+ uint32_t x119 = cmovznz32(x118, 0x0, 0xffffffff);
  uint32_t x120 = (x119 & 0x1fffef);
  uint32_t x122, uint8_t x123 = Op (Syntax.AddWithGetCarry 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x48, Return x120);
  uint32_t x124 = (x119 & 0xfffff);
diff --git a/src/Specific/solinas32_2e489m21/freeze.c b/src/Specific/solinas32_2e489m21/freeze.c
index 1e62bf219..bef638c96 100644
--- a/src/Specific/solinas32_2e489m21/freeze.c
+++ b/src/Specific/solinas32_2e489m21/freeze.c
@@ -53,7 +53,7 @@ static void freeze(uint32_t out[27], const uint32_t in1[27]) {
   { uint32_t x126, uint8_t x127 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x124, Return x50, 0x3ffff);
   { uint32_t x129, uint8_t x130 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x127, Return x52, 0x3ffff);
   { uint32_t x132, uint8_t x133 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x130, Return x51, 0x3ffff);
-  { uint32_t x134 = (uint32_t)cmovznz(x133, 0x0, 0xffffffff);
+  { uint32_t x134 = cmovznz32(x133, 0x0, 0xffffffff);
   { uint32_t x135 = (x134 & 0x7ffeb);
   { uint32_t x137, uint8_t x138 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x54, Return x135);
   { uint32_t x139 = (x134 & 0x3ffff);
diff --git a/src/Specific/solinas32_2e489m21/freezeDisplay.log b/src/Specific/solinas32_2e489m21/freezeDisplay.log
index 28517afec..ca45eb256 100644
--- a/src/Specific/solinas32_2e489m21/freezeDisplay.log
+++ b/src/Specific/solinas32_2e489m21/freezeDisplay.log
@@ -29,7 +29,7 @@ Interp-η
  uint32_t x126, uint8_t x127 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x124, Return x50, 0x3ffff);
  uint32_t x129, uint8_t x130 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x127, Return x52, 0x3ffff);
  uint32_t x132, uint8_t x133 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x130, Return x51, 0x3ffff);
- uint32_t x134 = (uint32_t)cmovznz(x133, 0x0, 0xffffffff);
+ uint32_t x134 = cmovznz32(x133, 0x0, 0xffffffff);
  uint32_t x135 = (x134 & 0x7ffeb);
  uint32_t x137, uint8_t x138 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x54, Return x135);
  uint32_t x139 = (x134 & 0x3ffff);
diff --git a/src/Specific/solinas32_2e495m31/freeze.c b/src/Specific/solinas32_2e495m31/freeze.c
index 6559bc11a..578edfca4 100644
--- a/src/Specific/solinas32_2e495m31/freeze.c
+++ b/src/Specific/solinas32_2e495m31/freeze.c
@@ -37,7 +37,7 @@ static void freeze(uint32_t out[19], const uint32_t in1[19]) {
   { uint32_t x86, uint8_t x87 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x84, Return x34, 0x3ffffff);
   { uint32_t x89, uint8_t x90 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x87, Return x36, 0x3ffffff);
   { uint32_t x92, uint8_t x93 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x90, Return x35, 0x3ffffff);
-  { uint32_t x94 = (uint32_t)cmovznz(x93, 0x0, 0xffffffff);
+  { uint32_t x94 = cmovznz32(x93, 0x0, 0xffffffff);
   { uint32_t x95 = (x94 & 0x7ffffe1);
   { uint32_t x97, uint8_t x98 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x38, Return x95);
   { uint32_t x99 = (x94 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e495m31/freezeDisplay.log b/src/Specific/solinas32_2e495m31/freezeDisplay.log
index 544d3ac99..8ff3d14dc 100644
--- a/src/Specific/solinas32_2e495m31/freezeDisplay.log
+++ b/src/Specific/solinas32_2e495m31/freezeDisplay.log
@@ -21,7 +21,7 @@ Interp-η
  uint32_t x86, uint8_t x87 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x84, Return x34, 0x3ffffff);
  uint32_t x89, uint8_t x90 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x87, Return x36, 0x3ffffff);
  uint32_t x92, uint8_t x93 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x90, Return x35, 0x3ffffff);
- uint32_t x94 = (uint32_t)cmovznz(x93, 0x0, 0xffffffff);
+ uint32_t x94 = cmovznz32(x93, 0x0, 0xffffffff);
  uint32_t x95 = (x94 & 0x7ffffe1);
  uint32_t x97, uint8_t x98 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x38, Return x95);
  uint32_t x99 = (x94 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e510m290x2e496m1/freeze.c b/src/Specific/solinas32_2e510m290x2e496m1/freeze.c
index 95d84da79..d0e5eb447 100644
--- a/src/Specific/solinas32_2e510m290x2e496m1/freeze.c
+++ b/src/Specific/solinas32_2e510m290x2e496m1/freeze.c
@@ -47,7 +47,7 @@ static void freeze(uint32_t out[24], const uint32_t in1[24]) {
   { uint32_t x111, uint8_t x112 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x109, Return x44, 0x1fffff);
   { uint32_t x114, uint8_t x115 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x112, Return x46, 0x1fffff);
   { uint32_t x117, uint8_t x118 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x115, Return x45, 0x1f6eff);
-  { uint32_t x119 = (uint32_t)cmovznz(x118, 0x0, 0xffffffff);
+  { uint32_t x119 = cmovznz32(x118, 0x0, 0xffffffff);
   { uint32_t x120 = (x119 & 0x3fffff);
   { uint32_t x122, uint8_t x123 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x48, Return x120);
   { uint32_t x124 = (x119 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e510m290x2e496m1/freezeDisplay.log b/src/Specific/solinas32_2e510m290x2e496m1/freezeDisplay.log
index 4619f6faf..48c4c4b92 100644
--- a/src/Specific/solinas32_2e510m290x2e496m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e510m290x2e496m1/freezeDisplay.log
@@ -26,7 +26,7 @@ Interp-η
  uint32_t x111, uint8_t x112 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x109, Return x44, 0x1fffff);
  uint32_t x114, uint8_t x115 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x112, Return x46, 0x1fffff);
  uint32_t x117, uint8_t x118 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x115, Return x45, 0x1f6eff);
- uint32_t x119 = (uint32_t)cmovznz(x118, 0x0, 0xffffffff);
+ uint32_t x119 = cmovznz32(x118, 0x0, 0xffffffff);
  uint32_t x120 = (x119 & 0x3fffff);
  uint32_t x122, uint8_t x123 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x48, Return x120);
  uint32_t x124 = (x119 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e511m187/freeze.c b/src/Specific/solinas32_2e511m187/freeze.c
index d78a4ec72..245df8444 100644
--- a/src/Specific/solinas32_2e511m187/freeze.c
+++ b/src/Specific/solinas32_2e511m187/freeze.c
@@ -55,7 +55,7 @@ static void freeze(uint32_t out[28], const uint32_t in1[28]) {
   { uint32_t x131, uint8_t x132 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x129, Return x52, 0x3ffff);
   { uint32_t x134, uint8_t x135 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x132, Return x54, 0x3ffff);
   { uint32_t x137, uint8_t x138 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x135, Return x53, 0x3ffff);
-  { uint32_t x139 = (uint32_t)cmovznz(x138, 0x0, 0xffffffff);
+  { uint32_t x139 = cmovznz32(x138, 0x0, 0xffffffff);
   { uint32_t x140 = (x139 & 0x7ff45);
   { uint32_t x142, uint8_t x143 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x56, Return x140);
   { uint32_t x144 = (x139 & 0x3ffff);
diff --git a/src/Specific/solinas32_2e511m187/freezeDisplay.log b/src/Specific/solinas32_2e511m187/freezeDisplay.log
index d4f86744c..8d9b7d049 100644
--- a/src/Specific/solinas32_2e511m187/freezeDisplay.log
+++ b/src/Specific/solinas32_2e511m187/freezeDisplay.log
@@ -30,7 +30,7 @@ Interp-η
  uint32_t x131, uint8_t x132 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x129, Return x52, 0x3ffff);
  uint32_t x134, uint8_t x135 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x132, Return x54, 0x3ffff);
  uint32_t x137, uint8_t x138 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x135, Return x53, 0x3ffff);
- uint32_t x139 = (uint32_t)cmovznz(x138, 0x0, 0xffffffff);
+ uint32_t x139 = cmovznz32(x138, 0x0, 0xffffffff);
  uint32_t x140 = (x139 & 0x7ff45);
  uint32_t x142, uint8_t x143 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x56, Return x140);
  uint32_t x144 = (x139 & 0x3ffff);
diff --git a/src/Specific/solinas32_2e511m481/freeze.c b/src/Specific/solinas32_2e511m481/freeze.c
index 19faae65b..81a60fae1 100644
--- a/src/Specific/solinas32_2e511m481/freeze.c
+++ b/src/Specific/solinas32_2e511m481/freeze.c
@@ -55,7 +55,7 @@ static void freeze(uint32_t out[28], const uint32_t in1[28]) {
   { uint32_t x131, uint8_t x132 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x129, Return x52, 0x3ffff);
   { uint32_t x134, uint8_t x135 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x132, Return x54, 0x3ffff);
   { uint32_t x137, uint8_t x138 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x135, Return x53, 0x3ffff);
-  { uint32_t x139 = (uint32_t)cmovznz(x138, 0x0, 0xffffffff);
+  { uint32_t x139 = cmovznz32(x138, 0x0, 0xffffffff);
   { uint32_t x140 = (x139 & 0x7fe1f);
   { uint32_t x142, uint8_t x143 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x56, Return x140);
   { uint32_t x144 = (x139 & 0x3ffff);
diff --git a/src/Specific/solinas32_2e511m481/freezeDisplay.log b/src/Specific/solinas32_2e511m481/freezeDisplay.log
index b7a80fc7a..b937cbf6a 100644
--- a/src/Specific/solinas32_2e511m481/freezeDisplay.log
+++ b/src/Specific/solinas32_2e511m481/freezeDisplay.log
@@ -30,7 +30,7 @@ Interp-η
  uint32_t x131, uint8_t x132 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x129, Return x52, 0x3ffff);
  uint32_t x134, uint8_t x135 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x132, Return x54, 0x3ffff);
  uint32_t x137, uint8_t x138 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x135, Return x53, 0x3ffff);
- uint32_t x139 = (uint32_t)cmovznz(x138, 0x0, 0xffffffff);
+ uint32_t x139 = cmovznz32(x138, 0x0, 0xffffffff);
  uint32_t x140 = (x139 & 0x7fe1f);
  uint32_t x142, uint8_t x143 = Op (Syntax.AddWithGetCarry 19 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x56, Return x140);
  uint32_t x144 = (x139 & 0x3ffff);
diff --git a/src/Specific/solinas32_2e512m491x2e496m1/freeze.c b/src/Specific/solinas32_2e512m491x2e496m1/freeze.c
index 4d3f913da..fe6196972 100644
--- a/src/Specific/solinas32_2e512m491x2e496m1/freeze.c
+++ b/src/Specific/solinas32_2e512m491x2e496m1/freeze.c
@@ -47,7 +47,7 @@ static void freeze(uint32_t out[24], const uint32_t in1[24]) {
   { uint32_t x111, uint8_t x112 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x109, Return x44, 0x3fffff);
   { uint32_t x114, uint8_t x115 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x112, Return x46, 0x1fffff);
   { uint32_t x117, uint8_t x118 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x115, Return x45, 0x1fc29f);
-  { uint32_t x119 = (uint32_t)cmovznz(x118, 0x0, 0xffffffff);
+  { uint32_t x119 = cmovznz32(x118, 0x0, 0xffffffff);
   { uint32_t x120 = (x119 & 0x3fffff);
   { uint32_t x122, uint8_t x123 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x48, Return x120);
   { uint32_t x124 = (x119 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e512m491x2e496m1/freezeDisplay.log b/src/Specific/solinas32_2e512m491x2e496m1/freezeDisplay.log
index 978df2136..147f52faa 100644
--- a/src/Specific/solinas32_2e512m491x2e496m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e512m491x2e496m1/freezeDisplay.log
@@ -26,7 +26,7 @@ Interp-η
  uint32_t x111, uint8_t x112 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x109, Return x44, 0x3fffff);
  uint32_t x114, uint8_t x115 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x112, Return x46, 0x1fffff);
  uint32_t x117, uint8_t x118 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x115, Return x45, 0x1fc29f);
- uint32_t x119 = (uint32_t)cmovznz(x118, 0x0, 0xffffffff);
+ uint32_t x119 = cmovznz32(x118, 0x0, 0xffffffff);
  uint32_t x120 = (x119 & 0x3fffff);
  uint32_t x122, uint8_t x123 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x48, Return x120);
  uint32_t x124 = (x119 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e512m569/freeze.c b/src/Specific/solinas32_2e512m569/freeze.c
index 17b83cc6c..a06bca255 100644
--- a/src/Specific/solinas32_2e512m569/freeze.c
+++ b/src/Specific/solinas32_2e512m569/freeze.c
@@ -47,7 +47,7 @@ static void freeze(uint32_t out[24], const uint32_t in1[24]) {
   { uint32_t x111, uint8_t x112 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x109, Return x44, 0x3fffff);
   { uint32_t x114, uint8_t x115 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x112, Return x46, 0x1fffff);
   { uint32_t x117, uint8_t x118 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x115, Return x45, 0x1fffff);
-  { uint32_t x119 = (uint32_t)cmovznz(x118, 0x0, 0xffffffff);
+  { uint32_t x119 = cmovznz32(x118, 0x0, 0xffffffff);
   { uint32_t x120 = (x119 & 0x3ffdc7);
   { uint32_t x122, uint8_t x123 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x48, Return x120);
   { uint32_t x124 = (x119 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e512m569/freezeDisplay.log b/src/Specific/solinas32_2e512m569/freezeDisplay.log
index 93577ad27..d3f60da16 100644
--- a/src/Specific/solinas32_2e512m569/freezeDisplay.log
+++ b/src/Specific/solinas32_2e512m569/freezeDisplay.log
@@ -26,7 +26,7 @@ Interp-η
  uint32_t x111, uint8_t x112 = Op (Syntax.SubWithGetBorrow 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x109, Return x44, 0x3fffff);
  uint32_t x114, uint8_t x115 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x112, Return x46, 0x1fffff);
  uint32_t x117, uint8_t x118 = Op (Syntax.SubWithGetBorrow 21 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x115, Return x45, 0x1fffff);
- uint32_t x119 = (uint32_t)cmovznz(x118, 0x0, 0xffffffff);
+ uint32_t x119 = cmovznz32(x118, 0x0, 0xffffffff);
  uint32_t x120 = (x119 & 0x3ffdc7);
  uint32_t x122, uint8_t x123 = Op (Syntax.AddWithGetCarry 22 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x48, Return x120);
  uint32_t x124 = (x119 & 0x1fffff);
diff --git a/src/Specific/solinas32_2e521m1/freeze.c b/src/Specific/solinas32_2e521m1/freeze.c
index d727ebb5d..aa2e4e36c 100644
--- a/src/Specific/solinas32_2e521m1/freeze.c
+++ b/src/Specific/solinas32_2e521m1/freeze.c
@@ -39,7 +39,7 @@ static void freeze(uint32_t out[20], const uint32_t in1[20]) {
   { uint32_t x91, uint8_t x92 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x89, Return x36, 0x3ffffff);
   { uint32_t x94, uint8_t x95 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x92, Return x38, 0x3ffffff);
   { uint32_t x97, uint8_t x98 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x95, Return x37, 0x3ffffff);
-  { uint32_t x99 = (uint32_t)cmovznz(x98, 0x0, 0xffffffff);
+  { uint32_t x99 = cmovznz32(x98, 0x0, 0xffffffff);
   { uint32_t x100 = (x99 & 0x7ffffff);
   { uint32_t x102, uint8_t x103 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x40, Return x100);
   { uint32_t x104 = (x99 & 0x3ffffff);
diff --git a/src/Specific/solinas32_2e521m1/freezeDisplay.log b/src/Specific/solinas32_2e521m1/freezeDisplay.log
index ca79a12a9..6abf83604 100644
--- a/src/Specific/solinas32_2e521m1/freezeDisplay.log
+++ b/src/Specific/solinas32_2e521m1/freezeDisplay.log
@@ -22,7 +22,7 @@ Interp-η
  uint32_t x91, uint8_t x92 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x89, Return x36, 0x3ffffff);
  uint32_t x94, uint8_t x95 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x92, Return x38, 0x3ffffff);
  uint32_t x97, uint8_t x98 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x95, Return x37, 0x3ffffff);
- uint32_t x99 = (uint32_t)cmovznz(x98, 0x0, 0xffffffff);
+ uint32_t x99 = cmovznz32(x98, 0x0, 0xffffffff);
  uint32_t x100 = (x99 & 0x7ffffff);
  uint32_t x102, uint8_t x103 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x40, Return x100);
  uint32_t x104 = (x99 & 0x3ffffff);
diff --git a/src/Specific/solinas64_2e127m1/freeze.c b/src/Specific/solinas64_2e127m1/freeze.c
index 7f3ddd4fe..c032d35b1 100644
--- a/src/Specific/solinas64_2e127m1/freeze.c
+++ b/src/Specific/solinas64_2e127m1/freeze.c
@@ -5,7 +5,7 @@ static void freeze(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x7ffffffffff);
   { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 42 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x3ffffffffff);
   { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 42 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x3ffffffffff);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0x7ffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
   { uint64_t x19 = (x14 & 0x3ffffffffff);
diff --git a/src/Specific/solinas64_2e127m1/freezeDisplay.log b/src/Specific/solinas64_2e127m1/freezeDisplay.log
index ce3a9afd2..48a026179 100644
--- a/src/Specific/solinas64_2e127m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e127m1/freezeDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x7ffffffffff);
  uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 42 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x3ffffffffff);
  uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 42 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x3ffffffffff);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0x7ffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
  uint64_t x19 = (x14 & 0x3ffffffffff);
diff --git a/src/Specific/solinas64_2e129m25/freeze.c b/src/Specific/solinas64_2e129m25/freeze.c
index dafc25f97..a0c83f37d 100644
--- a/src/Specific/solinas64_2e129m25/freeze.c
+++ b/src/Specific/solinas64_2e129m25/freeze.c
@@ -5,7 +5,7 @@ static void freeze(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x7ffffffffe7);
   { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x7ffffffffff);
   { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x7ffffffffff);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0x7ffffffffe7);
   { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
   { uint64_t x19 = (x14 & 0x7ffffffffff);
diff --git a/src/Specific/solinas64_2e129m25/freezeDisplay.log b/src/Specific/solinas64_2e129m25/freezeDisplay.log
index fe867e1e6..d45479954 100644
--- a/src/Specific/solinas64_2e129m25/freezeDisplay.log
+++ b/src/Specific/solinas64_2e129m25/freezeDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x7ffffffffe7);
  uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x7ffffffffff);
  uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x7ffffffffff);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0x7ffffffffe7);
  uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
  uint64_t x19 = (x14 & 0x7ffffffffff);
diff --git a/src/Specific/solinas64_2e130m5/freeze.c b/src/Specific/solinas64_2e130m5/freeze.c
index d6ee6998a..442eefaf1 100644
--- a/src/Specific/solinas64_2e130m5/freeze.c
+++ b/src/Specific/solinas64_2e130m5/freeze.c
@@ -5,7 +5,7 @@ static void freeze(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 44 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0xffffffffffb);
   { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x7ffffffffff);
   { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x7ffffffffff);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xffffffffffb);
   { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 44 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
   { uint64_t x19 = (x14 & 0x7ffffffffff);
diff --git a/src/Specific/solinas64_2e130m5/freezeDisplay.log b/src/Specific/solinas64_2e130m5/freezeDisplay.log
index 982270b58..ef7c05558 100644
--- a/src/Specific/solinas64_2e130m5/freezeDisplay.log
+++ b/src/Specific/solinas64_2e130m5/freezeDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 44 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0xffffffffffb);
  uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x7ffffffffff);
  uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x7ffffffffff);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xffffffffffb);
  uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 44 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
  uint64_t x19 = (x14 & 0x7ffffffffff);
diff --git a/src/Specific/solinas64_2e137m13/freeze.c b/src/Specific/solinas64_2e137m13/freeze.c
index 483386c55..0ff635111 100644
--- a/src/Specific/solinas64_2e137m13/freeze.c
+++ b/src/Specific/solinas64_2e137m13/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 34 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x3ffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 34 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x3ffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 34 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x3ffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0x7fffffff3);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 35 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x3ffffffff);
diff --git a/src/Specific/solinas64_2e137m13/freezeDisplay.log b/src/Specific/solinas64_2e137m13/freezeDisplay.log
index ae0f4a872..ca2db3c69 100644
--- a/src/Specific/solinas64_2e137m13/freezeDisplay.log
+++ b/src/Specific/solinas64_2e137m13/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 34 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x3ffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 34 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x3ffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 34 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x3ffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0x7fffffff3);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 35 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x3ffffffff);
diff --git a/src/Specific/solinas64_2e140m27/freeze.c b/src/Specific/solinas64_2e140m27/freeze.c
index f6b72ec72..2d8379135 100644
--- a/src/Specific/solinas64_2e140m27/freeze.c
+++ b/src/Specific/solinas64_2e140m27/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 35 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7ffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 35 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x7ffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 35 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7ffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0x7ffffffe5);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 35 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x7ffffffff);
diff --git a/src/Specific/solinas64_2e140m27/freezeDisplay.log b/src/Specific/solinas64_2e140m27/freezeDisplay.log
index 88a4dd23d..d3fcf0a5d 100644
--- a/src/Specific/solinas64_2e140m27/freezeDisplay.log
+++ b/src/Specific/solinas64_2e140m27/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 35 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7ffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 35 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x7ffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 35 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7ffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0x7ffffffe5);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 35 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x7ffffffff);
diff --git a/src/Specific/solinas64_2e141m9/freeze.c b/src/Specific/solinas64_2e141m9/freeze.c
index b4529db52..d1a0d57f5 100644
--- a/src/Specific/solinas64_2e141m9/freeze.c
+++ b/src/Specific/solinas64_2e141m9/freeze.c
@@ -5,7 +5,7 @@ static void freeze(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x7ffffffffff7);
   { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x7fffffffffff);
   { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x7fffffffffff);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0x7ffffffffff7);
   { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
   { uint64_t x19 = (x14 & 0x7fffffffffff);
diff --git a/src/Specific/solinas64_2e141m9/freezeDisplay.log b/src/Specific/solinas64_2e141m9/freezeDisplay.log
index 6889eb579..6bcb50b66 100644
--- a/src/Specific/solinas64_2e141m9/freezeDisplay.log
+++ b/src/Specific/solinas64_2e141m9/freezeDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x7ffffffffff7);
  uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x7fffffffffff);
  uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x7fffffffffff);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0x7ffffffffff7);
  uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
  uint64_t x19 = (x14 & 0x7fffffffffff);
diff --git a/src/Specific/solinas64_2e150m3/freeze.c b/src/Specific/solinas64_2e150m3/freeze.c
index b0014eb20..e69cfbeeb 100644
--- a/src/Specific/solinas64_2e150m3/freeze.c
+++ b/src/Specific/solinas64_2e150m3/freeze.c
@@ -5,7 +5,7 @@ static void freeze(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x3fffffffffffd);
   { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x3ffffffffffff);
   { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x3ffffffffffff);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0x3fffffffffffd);
   { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
   { uint64_t x19 = (x14 & 0x3ffffffffffff);
diff --git a/src/Specific/solinas64_2e150m3/freezeDisplay.log b/src/Specific/solinas64_2e150m3/freezeDisplay.log
index 3241904a2..3a7a67072 100644
--- a/src/Specific/solinas64_2e150m3/freezeDisplay.log
+++ b/src/Specific/solinas64_2e150m3/freezeDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x3fffffffffffd);
  uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x3ffffffffffff);
  uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x3ffffffffffff);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0x3fffffffffffd);
  uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
  uint64_t x19 = (x14 & 0x3ffffffffffff);
diff --git a/src/Specific/solinas64_2e150m5/freeze.c b/src/Specific/solinas64_2e150m5/freeze.c
index 69d637ccb..0283f7ae1 100644
--- a/src/Specific/solinas64_2e150m5/freeze.c
+++ b/src/Specific/solinas64_2e150m5/freeze.c
@@ -5,7 +5,7 @@ static void freeze(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x3fffffffffffb);
   { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x3ffffffffffff);
   { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x3ffffffffffff);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0x3fffffffffffb);
   { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
   { uint64_t x19 = (x14 & 0x3ffffffffffff);
diff --git a/src/Specific/solinas64_2e150m5/freezeDisplay.log b/src/Specific/solinas64_2e150m5/freezeDisplay.log
index 979be6cac..90dc24017 100644
--- a/src/Specific/solinas64_2e150m5/freezeDisplay.log
+++ b/src/Specific/solinas64_2e150m5/freezeDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x3fffffffffffb);
  uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x3ffffffffffff);
  uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x3ffffffffffff);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0x3fffffffffffb);
  uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
  uint64_t x19 = (x14 & 0x3ffffffffffff);
diff --git a/src/Specific/solinas64_2e152m17/freeze.c b/src/Specific/solinas64_2e152m17/freeze.c
index 0a08e7145..39ce4203c 100644
--- a/src/Specific/solinas64_2e152m17/freeze.c
+++ b/src/Specific/solinas64_2e152m17/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x3fffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x3fffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x3fffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0x3fffffffef);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x3fffffffff);
diff --git a/src/Specific/solinas64_2e152m17/freezeDisplay.log b/src/Specific/solinas64_2e152m17/freezeDisplay.log
index 9bfbc89cc..9c337e131 100644
--- a/src/Specific/solinas64_2e152m17/freezeDisplay.log
+++ b/src/Specific/solinas64_2e152m17/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x3fffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x3fffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x3fffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0x3fffffffef);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x3fffffffff);
diff --git a/src/Specific/solinas64_2e158m15/freeze.c b/src/Specific/solinas64_2e158m15/freeze.c
index cf4f4ba9c..b93e29773 100644
--- a/src/Specific/solinas64_2e158m15/freeze.c
+++ b/src/Specific/solinas64_2e158m15/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 39 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7fffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 40 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 39 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7fffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffff1);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 40 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x7fffffffff);
diff --git a/src/Specific/solinas64_2e158m15/freezeDisplay.log b/src/Specific/solinas64_2e158m15/freezeDisplay.log
index b2ac47c12..2c532f3eb 100644
--- a/src/Specific/solinas64_2e158m15/freezeDisplay.log
+++ b/src/Specific/solinas64_2e158m15/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 39 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7fffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 40 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 39 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7fffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffff1);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 40 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x7fffffffff);
diff --git a/src/Specific/solinas64_2e165m25/freeze.c b/src/Specific/solinas64_2e165m25/freeze.c
index 36bdf6e07..6cdc223df 100644
--- a/src/Specific/solinas64_2e165m25/freeze.c
+++ b/src/Specific/solinas64_2e165m25/freeze.c
@@ -5,7 +5,7 @@ static void freeze(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x7fffffffffffe7);
   { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x7fffffffffffff);
   { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x7fffffffffffff);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0x7fffffffffffe7);
   { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
   { uint64_t x19 = (x14 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e165m25/freezeDisplay.log b/src/Specific/solinas64_2e165m25/freezeDisplay.log
index 6b29a7255..f056ae1bd 100644
--- a/src/Specific/solinas64_2e165m25/freezeDisplay.log
+++ b/src/Specific/solinas64_2e165m25/freezeDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x7fffffffffffe7);
  uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x7fffffffffffff);
  uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x7fffffffffffff);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0x7fffffffffffe7);
  uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
  uint64_t x19 = (x14 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e166m5/freeze.c b/src/Specific/solinas64_2e166m5/freeze.c
index d5c6575a3..039a7e77a 100644
--- a/src/Specific/solinas64_2e166m5/freeze.c
+++ b/src/Specific/solinas64_2e166m5/freeze.c
@@ -5,7 +5,7 @@ static void freeze(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0xfffffffffffffb);
   { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x7fffffffffffff);
   { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x7fffffffffffff);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0xfffffffffffffb);
   { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
   { uint64_t x19 = (x14 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e166m5/freezeDisplay.log b/src/Specific/solinas64_2e166m5/freezeDisplay.log
index 15edcc478..49424f528 100644
--- a/src/Specific/solinas64_2e166m5/freezeDisplay.log
+++ b/src/Specific/solinas64_2e166m5/freezeDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0xfffffffffffffb);
  uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x7fffffffffffff);
  uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x7fffffffffffff);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0xfffffffffffffb);
  uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
  uint64_t x19 = (x14 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e171m19/freeze.c b/src/Specific/solinas64_2e171m19/freeze.c
index 467ff2338..4dfecb1df 100644
--- a/src/Specific/solinas64_2e171m19/freeze.c
+++ b/src/Specific/solinas64_2e171m19/freeze.c
@@ -5,7 +5,7 @@ static void freeze(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x1ffffffffffffed);
   { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x1ffffffffffffff);
   { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x1ffffffffffffff);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0x1ffffffffffffed);
   { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
   { uint64_t x19 = (x14 & 0x1ffffffffffffff);
diff --git a/src/Specific/solinas64_2e171m19/freezeDisplay.log b/src/Specific/solinas64_2e171m19/freezeDisplay.log
index bc094f9c3..95f2aa18b 100644
--- a/src/Specific/solinas64_2e171m19/freezeDisplay.log
+++ b/src/Specific/solinas64_2e171m19/freezeDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x1ffffffffffffed);
  uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x1ffffffffffffff);
  uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x1ffffffffffffff);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0x1ffffffffffffed);
  uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
  uint64_t x19 = (x14 & 0x1ffffffffffffff);
diff --git a/src/Specific/solinas64_2e174m17/freeze.c b/src/Specific/solinas64_2e174m17/freeze.c
index 812f230b3..7593d076d 100644
--- a/src/Specific/solinas64_2e174m17/freeze.c
+++ b/src/Specific/solinas64_2e174m17/freeze.c
@@ -5,7 +5,7 @@ static void freeze(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x3ffffffffffffef);
   { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x3ffffffffffffff);
   { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x3ffffffffffffff);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0x3ffffffffffffef);
   { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
   { uint64_t x19 = (x14 & 0x3ffffffffffffff);
diff --git a/src/Specific/solinas64_2e174m17/freezeDisplay.log b/src/Specific/solinas64_2e174m17/freezeDisplay.log
index 24802966b..2ae343b92 100644
--- a/src/Specific/solinas64_2e174m17/freezeDisplay.log
+++ b/src/Specific/solinas64_2e174m17/freezeDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x3ffffffffffffef);
  uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x3ffffffffffffff);
  uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x3ffffffffffffff);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0x3ffffffffffffef);
  uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
  uint64_t x19 = (x14 & 0x3ffffffffffffff);
diff --git a/src/Specific/solinas64_2e174m3/freeze.c b/src/Specific/solinas64_2e174m3/freeze.c
index 1ac044bad..42e104e38 100644
--- a/src/Specific/solinas64_2e174m3/freeze.c
+++ b/src/Specific/solinas64_2e174m3/freeze.c
@@ -5,7 +5,7 @@ static void freeze(uint64_t out[3], const uint64_t in1[3]) {
   { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x3fffffffffffffd);
   { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x3ffffffffffffff);
   { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x3ffffffffffffff);
-  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
   { uint64_t x15 = (x14 & 0x3fffffffffffffd);
   { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
   { uint64_t x19 = (x14 & 0x3ffffffffffffff);
diff --git a/src/Specific/solinas64_2e174m3/freezeDisplay.log b/src/Specific/solinas64_2e174m3/freezeDisplay.log
index e642294f1..3a8210248 100644
--- a/src/Specific/solinas64_2e174m3/freezeDisplay.log
+++ b/src/Specific/solinas64_2e174m3/freezeDisplay.log
@@ -5,7 +5,7 @@ Interp-η
  uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x3fffffffffffffd);
  uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x3ffffffffffffff);
  uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x3ffffffffffffff);
- uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+ uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL);
  uint64_t x15 = (x14 & 0x3fffffffffffffd);
  uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
  uint64_t x19 = (x14 & 0x3ffffffffffffff);
diff --git a/src/Specific/solinas64_2e189m25/freeze.c b/src/Specific/solinas64_2e189m25/freeze.c
index 91d37e173..45ab54c8d 100644
--- a/src/Specific/solinas64_2e189m25/freeze.c
+++ b/src/Specific/solinas64_2e189m25/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7fffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x7fffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7fffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffe7);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x7fffffffffff);
diff --git a/src/Specific/solinas64_2e189m25/freezeDisplay.log b/src/Specific/solinas64_2e189m25/freezeDisplay.log
index c8e5d77a0..459e8b8d2 100644
--- a/src/Specific/solinas64_2e189m25/freezeDisplay.log
+++ b/src/Specific/solinas64_2e189m25/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7fffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x7fffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7fffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffe7);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x7fffffffffff);
diff --git a/src/Specific/solinas64_2e190m11/freeze.c b/src/Specific/solinas64_2e190m11/freeze.c
index 3ec01360f..7a7c45793 100644
--- a/src/Specific/solinas64_2e190m11/freeze.c
+++ b/src/Specific/solinas64_2e190m11/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7fffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7fffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffff5);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x7fffffffffff);
diff --git a/src/Specific/solinas64_2e190m11/freezeDisplay.log b/src/Specific/solinas64_2e190m11/freezeDisplay.log
index 247dfc8dc..d0480da0c 100644
--- a/src/Specific/solinas64_2e190m11/freezeDisplay.log
+++ b/src/Specific/solinas64_2e190m11/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7fffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7fffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffff5);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x7fffffffffff);
diff --git a/src/Specific/solinas64_2e191m19/freeze.c b/src/Specific/solinas64_2e191m19/freeze.c
index 777bc6261..ab0600622 100644
--- a/src/Specific/solinas64_2e191m19/freeze.c
+++ b/src/Specific/solinas64_2e191m19/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x3fffffffff);
   { uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x3fffffffff);
   { uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x3fffffffff);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0x7fffffffed);
   { uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 39 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
   { uint64_t x29 = (x24 & 0x3fffffffff);
diff --git a/src/Specific/solinas64_2e191m19/freezeDisplay.log b/src/Specific/solinas64_2e191m19/freezeDisplay.log
index d0ebeea59..1a2e9f3b1 100644
--- a/src/Specific/solinas64_2e191m19/freezeDisplay.log
+++ b/src/Specific/solinas64_2e191m19/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x3fffffffff);
  uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x3fffffffff);
  uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x3fffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0x7fffffffed);
  uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 39 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
  uint64_t x29 = (x24 & 0x3fffffffff);
diff --git a/src/Specific/solinas64_2e192m2e64m1/freeze.c b/src/Specific/solinas64_2e192m2e64m1/freeze.c
index 13fa2920c..c1e4735bd 100644
--- a/src/Specific/solinas64_2e192m2e64m1/freeze.c
+++ b/src/Specific/solinas64_2e192m2e64m1/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0xfffffffeffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0xffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffff);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0xfffffffeffff);
diff --git a/src/Specific/solinas64_2e192m2e64m1/freezeDisplay.log b/src/Specific/solinas64_2e192m2e64m1/freezeDisplay.log
index d40bc63af..ea4bfd068 100644
--- a/src/Specific/solinas64_2e192m2e64m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e192m2e64m1/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0xfffffffeffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0xffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffff);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0xfffffffeffff);
diff --git a/src/Specific/solinas64_2e194m33/freeze.c b/src/Specific/solinas64_2e194m33/freeze.c
index 6fb0fa4d3..92cbe9964 100644
--- a/src/Specific/solinas64_2e194m33/freeze.c
+++ b/src/Specific/solinas64_2e194m33/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0xffffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x1ffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0xffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0x1ffffffffffdf);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0xffffffffffff);
diff --git a/src/Specific/solinas64_2e194m33/freezeDisplay.log b/src/Specific/solinas64_2e194m33/freezeDisplay.log
index cffdbbef8..38df2685d 100644
--- a/src/Specific/solinas64_2e194m33/freezeDisplay.log
+++ b/src/Specific/solinas64_2e194m33/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0xffffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x1ffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0xffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0x1ffffffffffdf);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0xffffffffffff);
diff --git a/src/Specific/solinas64_2e196m15/freeze.c b/src/Specific/solinas64_2e196m15/freeze.c
index f5ab2b763..bdc2f7c30 100644
--- a/src/Specific/solinas64_2e196m15/freeze.c
+++ b/src/Specific/solinas64_2e196m15/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x1ffffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x1ffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x1ffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0x1fffffffffff1);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x1ffffffffffff);
diff --git a/src/Specific/solinas64_2e196m15/freezeDisplay.log b/src/Specific/solinas64_2e196m15/freezeDisplay.log
index 8fb3eb532..372b48361 100644
--- a/src/Specific/solinas64_2e196m15/freezeDisplay.log
+++ b/src/Specific/solinas64_2e196m15/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x1ffffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x1ffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x1ffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0x1fffffffffff1);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x1ffffffffffff);
diff --git a/src/Specific/solinas64_2e198m17/freeze.c b/src/Specific/solinas64_2e198m17/freeze.c
index 49699e061..0c7b96d4a 100644
--- a/src/Specific/solinas64_2e198m17/freeze.c
+++ b/src/Specific/solinas64_2e198m17/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x1ffffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x3ffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x1ffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0x3ffffffffffef);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x1ffffffffffff);
diff --git a/src/Specific/solinas64_2e198m17/freezeDisplay.log b/src/Specific/solinas64_2e198m17/freezeDisplay.log
index ba48f9914..5ff2bff86 100644
--- a/src/Specific/solinas64_2e198m17/freezeDisplay.log
+++ b/src/Specific/solinas64_2e198m17/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x1ffffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x3ffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 49 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x1ffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0x3ffffffffffef);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x1ffffffffffff);
diff --git a/src/Specific/solinas64_2e205m45x2e198m1/freeze.c b/src/Specific/solinas64_2e205m45x2e198m1/freeze.c
index 92ad7407b..a506c2a8e 100644
--- a/src/Specific/solinas64_2e205m45x2e198m1/freeze.c
+++ b/src/Specific/solinas64_2e205m45x2e198m1/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u51(x9, x4, 0x7ffffffffffff, &x11);
   { uint64_t x14; uint8_t x15 = _subborrow_u51(x12, x6, 0x7ffffffffffff, &x14);
   { uint64_t x17; uint8_t x18 = _subborrow_u51(x15, x5, 0x52fffffffffff, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffffff);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e205m45x2e198m1/freezeDisplay.log b/src/Specific/solinas64_2e205m45x2e198m1/freezeDisplay.log
index d12bc586d..2af9d6fcd 100644
--- a/src/Specific/solinas64_2e205m45x2e198m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e205m45x2e198m1/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u51(x9, x4, 0x7ffffffffffff);
  uint64_t x14, uint8_t x15 = subborrow_u51(x12, x6, 0x7ffffffffffff);
  uint64_t x17, uint8_t x18 = subborrow_u51(x15, x5, 0x52fffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffffff);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e206m5/freeze.c b/src/Specific/solinas64_2e206m5/freeze.c
index b60e0ad31..a6dea8ec3 100644
--- a/src/Specific/solinas64_2e206m5/freeze.c
+++ b/src/Specific/solinas64_2e206m5/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11; uint8_t x12 = _subborrow_u51(x9, x4, 0x7ffffffffffff, &x11);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xfffffffffffff);
   { uint64_t x17; uint8_t x18 = _subborrow_u51(x15, x5, 0x7ffffffffffff, &x17);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffffb);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e206m5/freezeDisplay.log b/src/Specific/solinas64_2e206m5/freezeDisplay.log
index 3c63162b7..79dd921e8 100644
--- a/src/Specific/solinas64_2e206m5/freezeDisplay.log
+++ b/src/Specific/solinas64_2e206m5/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u51(x9, x4, 0x7ffffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xfffffffffffff);
  uint64_t x17, uint8_t x18 = subborrow_u51(x15, x5, 0x7ffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffb);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e212m29/freeze.c b/src/Specific/solinas64_2e212m29/freeze.c
index 66574dbe1..ba2a57d23 100644
--- a/src/Specific/solinas64_2e212m29/freeze.c
+++ b/src/Specific/solinas64_2e212m29/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x1fffffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x1fffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x1fffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0x1fffffffffffe3);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x1fffffffffffff);
diff --git a/src/Specific/solinas64_2e212m29/freezeDisplay.log b/src/Specific/solinas64_2e212m29/freezeDisplay.log
index 2bb85ddf4..83cbb1bec 100644
--- a/src/Specific/solinas64_2e212m29/freezeDisplay.log
+++ b/src/Specific/solinas64_2e212m29/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x1fffffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x1fffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x1fffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0x1fffffffffffe3);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x1fffffffffffff);
diff --git a/src/Specific/solinas64_2e213m3/freeze.c b/src/Specific/solinas64_2e213m3/freeze.c
index 0ce2f392a..b27bdee4d 100644
--- a/src/Specific/solinas64_2e213m3/freeze.c
+++ b/src/Specific/solinas64_2e213m3/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x1fffffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x1fffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x1fffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0x3ffffffffffffd);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x1fffffffffffff);
diff --git a/src/Specific/solinas64_2e213m3/freezeDisplay.log b/src/Specific/solinas64_2e213m3/freezeDisplay.log
index 8c092ccf3..34d7db38c 100644
--- a/src/Specific/solinas64_2e213m3/freezeDisplay.log
+++ b/src/Specific/solinas64_2e213m3/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x1fffffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x1fffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x1fffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0x3ffffffffffffd);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x1fffffffffffff);
diff --git a/src/Specific/solinas64_2e216m2e108m1/freeze.c b/src/Specific/solinas64_2e216m2e108m1/freeze.c
index cf49d9fff..e653cc54b 100644
--- a/src/Specific/solinas64_2e216m2e108m1/freeze.c
+++ b/src/Specific/solinas64_2e216m2e108m1/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x3fffffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x3ffffffffffffe);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x3fffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0x3fffffffffffff);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x3fffffffffffff);
diff --git a/src/Specific/solinas64_2e216m2e108m1/freezeDisplay.log b/src/Specific/solinas64_2e216m2e108m1/freezeDisplay.log
index 4ae7e8134..380efd4d5 100644
--- a/src/Specific/solinas64_2e216m2e108m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e216m2e108m1/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x3fffffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x3ffffffffffffe);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x3fffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0x3fffffffffffff);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x3fffffffffffff);
diff --git a/src/Specific/solinas64_2e221m3/freeze.c b/src/Specific/solinas64_2e221m3/freeze.c
index 62fee1b86..b05893fd6 100644
--- a/src/Specific/solinas64_2e221m3/freeze.c
+++ b/src/Specific/solinas64_2e221m3/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7fffffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x7fffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7fffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xfffffffffffffd);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e221m3/freezeDisplay.log b/src/Specific/solinas64_2e221m3/freezeDisplay.log
index b6594f9c4..6c22bf989 100644
--- a/src/Specific/solinas64_2e221m3/freezeDisplay.log
+++ b/src/Specific/solinas64_2e221m3/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7fffffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x7fffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7fffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xfffffffffffffd);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e222m117/freeze.c b/src/Specific/solinas64_2e222m117/freeze.c
index c2f7bf6da..9c4d35595 100644
--- a/src/Specific/solinas64_2e222m117/freeze.c
+++ b/src/Specific/solinas64_2e222m117/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7fffffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xffffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7fffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0xffffffffffff8b);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e222m117/freezeDisplay.log b/src/Specific/solinas64_2e222m117/freezeDisplay.log
index 8d58babad..2fd34e0f6 100644
--- a/src/Specific/solinas64_2e222m117/freezeDisplay.log
+++ b/src/Specific/solinas64_2e222m117/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x7fffffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xffffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x7fffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffff8b);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e224m2e96p1/freeze.c b/src/Specific/solinas64_2e224m2e96p1/freeze.c
index eef7258b8..7228c2d33 100644
--- a/src/Specific/solinas64_2e224m2e96p1/freeze.c
+++ b/src/Specific/solinas64_2e224m2e96p1/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 56 Syntax.TZ (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0xffff0000000000);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xffffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0xffffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint8_t x20 = ((uint8_t)x19 & 0x1);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0xffff0000000000);
diff --git a/src/Specific/solinas64_2e224m2e96p1/freezeDisplay.log b/src/Specific/solinas64_2e224m2e96p1/freezeDisplay.log
index fbadbf690..00130badf 100644
--- a/src/Specific/solinas64_2e224m2e96p1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e224m2e96p1/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 56 Syntax.TZ (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0xffff0000000000);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0xffffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0xffffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint8_t x20 = ((uint8_t)x19 & 0x1);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0xffff0000000000);
diff --git a/src/Specific/solinas64_2e226m5/freeze.c b/src/Specific/solinas64_2e226m5/freeze.c
index 2f855e910..27a027c47 100644
--- a/src/Specific/solinas64_2e226m5/freeze.c
+++ b/src/Specific/solinas64_2e226m5/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0xffffffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x1ffffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0xffffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0x1fffffffffffffb);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e226m5/freezeDisplay.log b/src/Specific/solinas64_2e226m5/freezeDisplay.log
index 2c1cd72a7..89622811c 100644
--- a/src/Specific/solinas64_2e226m5/freezeDisplay.log
+++ b/src/Specific/solinas64_2e226m5/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0xffffffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x1ffffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0xffffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0x1fffffffffffffb);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e230m27/freeze.c b/src/Specific/solinas64_2e230m27/freeze.c
index ba5b9476e..038500201 100644
--- a/src/Specific/solinas64_2e230m27/freeze.c
+++ b/src/Specific/solinas64_2e230m27/freeze.c
@@ -7,7 +7,7 @@ static void freeze(uint64_t out[4], const uint64_t in1[4]) {
   { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x1ffffffffffffff);
   { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x3ffffffffffffff);
   { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x1ffffffffffffff);
-  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
   { uint64_t x20 = (x19 & 0x3ffffffffffffe5);
   { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
   { uint64_t x24 = (x19 & 0x1ffffffffffffff);
diff --git a/src/Specific/solinas64_2e230m27/freezeDisplay.log b/src/Specific/solinas64_2e230m27/freezeDisplay.log
index 8403b1af0..11aac547b 100644
--- a/src/Specific/solinas64_2e230m27/freezeDisplay.log
+++ b/src/Specific/solinas64_2e230m27/freezeDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x1ffffffffffffff);
  uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x3ffffffffffffff);
  uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x1ffffffffffffff);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0x3ffffffffffffe5);
  uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
  uint64_t x24 = (x19 & 0x1ffffffffffffff);
diff --git a/src/Specific/solinas64_2e235m15/freeze.c b/src/Specific/solinas64_2e235m15/freeze.c
index 867313133..db8f71551 100644
--- a/src/Specific/solinas64_2e235m15/freeze.c
+++ b/src/Specific/solinas64_2e235m15/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x7fffffffffff);
   { uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x7fffffffffff);
   { uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x7fffffffffff);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0x7ffffffffff1);
   { uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
   { uint64_t x29 = (x24 & 0x7fffffffffff);
diff --git a/src/Specific/solinas64_2e235m15/freezeDisplay.log b/src/Specific/solinas64_2e235m15/freezeDisplay.log
index 63ccf2532..da977944b 100644
--- a/src/Specific/solinas64_2e235m15/freezeDisplay.log
+++ b/src/Specific/solinas64_2e235m15/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x7fffffffffff);
  uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x7fffffffffff);
  uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x7fffffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0x7ffffffffff1);
  uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
  uint64_t x29 = (x24 & 0x7fffffffffff);
diff --git a/src/Specific/solinas64_2e243m9/freeze.c b/src/Specific/solinas64_2e243m9/freeze.c
index faa9b660e..56fe99d55 100644
--- a/src/Specific/solinas64_2e243m9/freeze.c
+++ b/src/Specific/solinas64_2e243m9/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 40 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0xffffffffff);
   { uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 41 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0x1ffffffffff);
   { uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 40 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0xffffffffff);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0x1fffffffff7);
   { uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 41 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint64_t x34 = (x29 & 0xffffffffff);
diff --git a/src/Specific/solinas64_2e243m9/freezeDisplay.log b/src/Specific/solinas64_2e243m9/freezeDisplay.log
index 4ae490780..2240ec6b1 100644
--- a/src/Specific/solinas64_2e243m9/freezeDisplay.log
+++ b/src/Specific/solinas64_2e243m9/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 40 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0xffffffffff);
  uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 41 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0x1ffffffffff);
  uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 40 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0xffffffffff);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0x1fffffffff7);
  uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 41 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint64_t x34 = (x29 & 0xffffffffff);
diff --git a/src/Specific/solinas64_2e251m9/freeze.c b/src/Specific/solinas64_2e251m9/freeze.c
index e15e96dc5..f21798fc1 100644
--- a/src/Specific/solinas64_2e251m9/freeze.c
+++ b/src/Specific/solinas64_2e251m9/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x3ffffffffffff);
   { uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x3ffffffffffff);
   { uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x3ffffffffffff);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0x7fffffffffff7);
   { uint64_t x27; uint8_t x28 = _addcarryx_u51(0x0, x10, x25, &x27);
   { uint64_t x29 = (x24 & 0x3ffffffffffff);
diff --git a/src/Specific/solinas64_2e251m9/freezeDisplay.log b/src/Specific/solinas64_2e251m9/freezeDisplay.log
index c4624319b..ea1f68ec7 100644
--- a/src/Specific/solinas64_2e251m9/freezeDisplay.log
+++ b/src/Specific/solinas64_2e251m9/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x3ffffffffffff);
  uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x3ffffffffffff);
  uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x3ffffffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0x7fffffffffff7);
  uint64_t x27, uint8_t x28 = addcarryx_u51(0x0, x10, x25);
  uint64_t x29 = (x24 & 0x3ffffffffffff);
diff --git a/src/Specific/solinas64_2e254m127x2e240m1/freeze.c b/src/Specific/solinas64_2e254m127x2e240m1/freeze.c
index 8bb96f6c3..4252df37f 100644
--- a/src/Specific/solinas64_2e254m127x2e240m1/freeze.c
+++ b/src/Specific/solinas64_2e254m127x2e240m1/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0x7ffffffffff);
   { uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 42 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0x3ffffffffff);
   { uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 42 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0x3f80fffffff);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0x7ffffffffff);
   { uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint64_t x34 = (x29 & 0x3ffffffffff);
diff --git a/src/Specific/solinas64_2e254m127x2e240m1/freezeDisplay.log b/src/Specific/solinas64_2e254m127x2e240m1/freezeDisplay.log
index a57d97e6e..fd8683e03 100644
--- a/src/Specific/solinas64_2e254m127x2e240m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e254m127x2e240m1/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0x7ffffffffff);
  uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 42 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0x3ffffffffff);
  uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 42 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0x3f80fffffff);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0x7ffffffffff);
  uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint64_t x34 = (x29 & 0x3ffffffffff);
diff --git a/src/Specific/solinas64_2e255m19/freeze.c b/src/Specific/solinas64_2e255m19/freeze.c
index b91d0e1f1..b52fd54f9 100644
--- a/src/Specific/solinas64_2e255m19/freeze.c
+++ b/src/Specific/solinas64_2e255m19/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16; uint8_t x17 = _subborrow_u51(x14, x6, 0x7ffffffffffff, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u51(x17, x8, 0x7ffffffffffff, &x19);
   { uint64_t x22; uint8_t x23 = _subborrow_u51(x20, x7, 0x7ffffffffffff, &x22);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0x7ffffffffffed);
   { uint64_t x27; uint8_t x28 = _addcarryx_u51(0x0, x10, x25, &x27);
   { uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e255m19/freezeDisplay.log b/src/Specific/solinas64_2e255m19/freezeDisplay.log
index e25c7e397..1fec36950 100644
--- a/src/Specific/solinas64_2e255m19/freezeDisplay.log
+++ b/src/Specific/solinas64_2e255m19/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = subborrow_u51(x14, x6, 0x7ffffffffffff);
  uint64_t x19, uint8_t x20 = subborrow_u51(x17, x8, 0x7ffffffffffff);
  uint64_t x22, uint8_t x23 = subborrow_u51(x20, x7, 0x7ffffffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0x7ffffffffffed);
  uint64_t x27, uint8_t x28 = addcarryx_u51(0x0, x10, x25);
  uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e255m2e4m2e1m1/freeze.c b/src/Specific/solinas64_2e255m2e4m2e1m1/freeze.c
index b91d0e1f1..b52fd54f9 100644
--- a/src/Specific/solinas64_2e255m2e4m2e1m1/freeze.c
+++ b/src/Specific/solinas64_2e255m2e4m2e1m1/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16; uint8_t x17 = _subborrow_u51(x14, x6, 0x7ffffffffffff, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u51(x17, x8, 0x7ffffffffffff, &x19);
   { uint64_t x22; uint8_t x23 = _subborrow_u51(x20, x7, 0x7ffffffffffff, &x22);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0x7ffffffffffed);
   { uint64_t x27; uint8_t x28 = _addcarryx_u51(0x0, x10, x25, &x27);
   { uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e255m2e4m2e1m1/freezeDisplay.log b/src/Specific/solinas64_2e255m2e4m2e1m1/freezeDisplay.log
index e25c7e397..1fec36950 100644
--- a/src/Specific/solinas64_2e255m2e4m2e1m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e255m2e4m2e1m1/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = subborrow_u51(x14, x6, 0x7ffffffffffff);
  uint64_t x19, uint8_t x20 = subborrow_u51(x17, x8, 0x7ffffffffffff);
  uint64_t x22, uint8_t x23 = subborrow_u51(x20, x7, 0x7ffffffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0x7ffffffffffed);
  uint64_t x27, uint8_t x28 = addcarryx_u51(0x0, x10, x25);
  uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e255m765/freeze.c b/src/Specific/solinas64_2e255m765/freeze.c
index 043900992..e594e5530 100644
--- a/src/Specific/solinas64_2e255m765/freeze.c
+++ b/src/Specific/solinas64_2e255m765/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16; uint8_t x17 = _subborrow_u51(x14, x6, 0x7ffffffffffff, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u51(x17, x8, 0x7ffffffffffff, &x19);
   { uint64_t x22; uint8_t x23 = _subborrow_u51(x20, x7, 0x7ffffffffffff, &x22);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0x7fffffffffd03);
   { uint64_t x27; uint8_t x28 = _addcarryx_u51(0x0, x10, x25, &x27);
   { uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e255m765/freezeDisplay.log b/src/Specific/solinas64_2e255m765/freezeDisplay.log
index bb86b79b9..32acd112d 100644
--- a/src/Specific/solinas64_2e255m765/freezeDisplay.log
+++ b/src/Specific/solinas64_2e255m765/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = subborrow_u51(x14, x6, 0x7ffffffffffff);
  uint64_t x19, uint8_t x20 = subborrow_u51(x17, x8, 0x7ffffffffffff);
  uint64_t x22, uint8_t x23 = subborrow_u51(x20, x7, 0x7ffffffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0x7fffffffffd03);
  uint64_t x27, uint8_t x28 = addcarryx_u51(0x0, x10, x25);
  uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e256m189/freeze.c b/src/Specific/solinas64_2e256m189/freeze.c
index 174b1619d..3bf5b68f3 100644
--- a/src/Specific/solinas64_2e256m189/freeze.c
+++ b/src/Specific/solinas64_2e256m189/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16; uint8_t x17 = _subborrow_u51(x14, x6, 0x7ffffffffffff, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u51(x17, x8, 0x7ffffffffffff, &x19);
   { uint64_t x22; uint8_t x23 = _subborrow_u51(x20, x7, 0x7ffffffffffff, &x22);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0xfffffffffff43);
   { uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
   { uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e256m189/freezeDisplay.log b/src/Specific/solinas64_2e256m189/freezeDisplay.log
index 7883de3cc..601faa4c7 100644
--- a/src/Specific/solinas64_2e256m189/freezeDisplay.log
+++ b/src/Specific/solinas64_2e256m189/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = subborrow_u51(x14, x6, 0x7ffffffffffff);
  uint64_t x19, uint8_t x20 = subborrow_u51(x17, x8, 0x7ffffffffffff);
  uint64_t x22, uint8_t x23 = subborrow_u51(x20, x7, 0x7ffffffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0xfffffffffff43);
  uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
  uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e256m2e224p2e192p2e96m1/freeze.c b/src/Specific/solinas64_2e256m2e224p2e192p2e96m1/freeze.c
index 3901aa11d..b5d95bd90 100644
--- a/src/Specific/solinas64_2e256m2e224p2e192p2e96m1/freeze.c
+++ b/src/Specific/solinas64_2e256m2e224p2e192p2e96m1/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16; ℤ x17 = _subborrow_u51ℤ(x14, x6, 0x0, &x16);
   { uint64_t x19; ℤ x20 = _subborrow_u51ℤ(x17, x8, 0x4000000000, &x19);
   { uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 51 Syntax.TZ (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x7fffffff80000);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0xfffffffffffff);
   { uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
   { uint64_t x29 = (x24 & 0xfffffffffff);
diff --git a/src/Specific/solinas64_2e256m2e224p2e192p2e96m1/freezeDisplay.log b/src/Specific/solinas64_2e256m2e224p2e192p2e96m1/freezeDisplay.log
index 057dcdead..f5f1f30bc 100644
--- a/src/Specific/solinas64_2e256m2e224p2e192p2e96m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e256m2e224p2e192p2e96m1/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, ℤ x17 = subborrow_u51ℤ(x14, x6, 0x0);
  uint64_t x19, ℤ x20 = subborrow_u51ℤ(x17, x8, 0x4000000000);
  uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 51 Syntax.TZ (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x7fffffff80000);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0xfffffffffffff);
  uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
  uint64_t x29 = (x24 & 0xfffffffffff);
diff --git a/src/Specific/solinas64_2e256m2e32m977/freeze.c b/src/Specific/solinas64_2e256m2e32m977/freeze.c
index e6380125f..e55425742 100644
--- a/src/Specific/solinas64_2e256m2e32m977/freeze.c
+++ b/src/Specific/solinas64_2e256m2e32m977/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16; uint8_t x17 = _subborrow_u51(x14, x6, 0x7ffffffffffff, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u51(x17, x8, 0x7ffffffffffff, &x19);
   { uint64_t x22; uint8_t x23 = _subborrow_u51(x20, x7, 0x7ffffffffffff, &x22);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0xffffefffffc2f);
   { uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
   { uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e256m2e32m977/freezeDisplay.log b/src/Specific/solinas64_2e256m2e32m977/freezeDisplay.log
index a8d42c89d..ce39618ba 100644
--- a/src/Specific/solinas64_2e256m2e32m977/freezeDisplay.log
+++ b/src/Specific/solinas64_2e256m2e32m977/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = subborrow_u51(x14, x6, 0x7ffffffffffff);
  uint64_t x19, uint8_t x20 = subborrow_u51(x17, x8, 0x7ffffffffffff);
  uint64_t x22, uint8_t x23 = subborrow_u51(x20, x7, 0x7ffffffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0xffffefffffc2f);
  uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
  uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e256m88x2e240m1/freeze.c b/src/Specific/solinas64_2e256m88x2e240m1/freeze.c
index a4fac224e..22c2343f6 100644
--- a/src/Specific/solinas64_2e256m88x2e240m1/freeze.c
+++ b/src/Specific/solinas64_2e256m88x2e240m1/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16; uint8_t x17 = _subborrow_u51(x14, x6, 0x7ffffffffffff, &x16);
   { uint64_t x19; uint8_t x20 = _subborrow_u51(x17, x8, 0x7ffffffffffff, &x19);
   { uint64_t x22; uint8_t x23 = _subborrow_u51(x20, x7, 0x7fd3fffffffff, &x22);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0xfffffffffffff);
   { uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
   { uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e256m88x2e240m1/freezeDisplay.log b/src/Specific/solinas64_2e256m88x2e240m1/freezeDisplay.log
index 49b708e00..dca10d578 100644
--- a/src/Specific/solinas64_2e256m88x2e240m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e256m88x2e240m1/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = subborrow_u51(x14, x6, 0x7ffffffffffff);
  uint64_t x19, uint8_t x20 = subborrow_u51(x17, x8, 0x7ffffffffffff);
  uint64_t x22, uint8_t x23 = subborrow_u51(x20, x7, 0x7fd3fffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0xfffffffffffff);
  uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
  uint64_t x29 = (x24 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e266m3/freeze.c b/src/Specific/solinas64_2e266m3/freeze.c
index aeae95dd8..36e1f6380 100644
--- a/src/Specific/solinas64_2e266m3/freeze.c
+++ b/src/Specific/solinas64_2e266m3/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x1fffffffffffff);
   { uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x1fffffffffffff);
   { uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x1fffffffffffff);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0x3ffffffffffffd);
   { uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
   { uint64_t x29 = (x24 & 0x1fffffffffffff);
diff --git a/src/Specific/solinas64_2e266m3/freezeDisplay.log b/src/Specific/solinas64_2e266m3/freezeDisplay.log
index cda12cdcd..add8edb9e 100644
--- a/src/Specific/solinas64_2e266m3/freezeDisplay.log
+++ b/src/Specific/solinas64_2e266m3/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x1fffffffffffff);
  uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x1fffffffffffff);
  uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x1fffffffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0x3ffffffffffffd);
  uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
  uint64_t x29 = (x24 & 0x1fffffffffffff);
diff --git a/src/Specific/solinas64_2e285m9/freeze.c b/src/Specific/solinas64_2e285m9/freeze.c
index 00ed78813..a41633544 100644
--- a/src/Specific/solinas64_2e285m9/freeze.c
+++ b/src/Specific/solinas64_2e285m9/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x1ffffffffffffff);
   { uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x1ffffffffffffff);
   { uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x1ffffffffffffff);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0x1fffffffffffff7);
   { uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
   { uint64_t x29 = (x24 & 0x1ffffffffffffff);
diff --git a/src/Specific/solinas64_2e285m9/freezeDisplay.log b/src/Specific/solinas64_2e285m9/freezeDisplay.log
index 01d1bb59e..9f8619d80 100644
--- a/src/Specific/solinas64_2e285m9/freezeDisplay.log
+++ b/src/Specific/solinas64_2e285m9/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x1ffffffffffffff);
  uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x1ffffffffffffff);
  uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x1ffffffffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0x1fffffffffffff7);
  uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
  uint64_t x29 = (x24 & 0x1ffffffffffffff);
diff --git a/src/Specific/solinas64_2e291m19/freeze.c b/src/Specific/solinas64_2e291m19/freeze.c
index be656508b..3e256f312 100644
--- a/src/Specific/solinas64_2e291m19/freeze.c
+++ b/src/Specific/solinas64_2e291m19/freeze.c
@@ -9,7 +9,7 @@ static void freeze(uint64_t out[5], const uint64_t in1[5]) {
   { uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x3ffffffffffffff);
   { uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x3ffffffffffffff);
   { uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x3ffffffffffffff);
-  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
   { uint64_t x25 = (x24 & 0x7ffffffffffffed);
   { uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
   { uint64_t x29 = (x24 & 0x3ffffffffffffff);
diff --git a/src/Specific/solinas64_2e291m19/freezeDisplay.log b/src/Specific/solinas64_2e291m19/freezeDisplay.log
index 812c60cbd..63fcc15c2 100644
--- a/src/Specific/solinas64_2e291m19/freezeDisplay.log
+++ b/src/Specific/solinas64_2e291m19/freezeDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint64_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x14, Return x6, 0x3ffffffffffffff);
  uint64_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x17, Return x8, 0x3ffffffffffffff);
  uint64_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x20, Return x7, 0x3ffffffffffffff);
- uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+ uint64_t x24 = cmovznz64(x23, 0x0, 0xffffffffffffffffL);
  uint64_t x25 = (x24 & 0x7ffffffffffffed);
  uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
  uint64_t x29 = (x24 & 0x3ffffffffffffff);
diff --git a/src/Specific/solinas64_2e321m9/freeze.c b/src/Specific/solinas64_2e321m9/freeze.c
index 5378a290e..73c7dc587 100644
--- a/src/Specific/solinas64_2e321m9/freeze.c
+++ b/src/Specific/solinas64_2e321m9/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0x1fffffffffffff);
   { uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0x3fffffffffffff);
   { uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0x1fffffffffffff);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0x3ffffffffffff7);
   { uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint64_t x34 = (x29 & 0x1fffffffffffff);
diff --git a/src/Specific/solinas64_2e321m9/freezeDisplay.log b/src/Specific/solinas64_2e321m9/freezeDisplay.log
index 44269c37f..a296ea7ed 100644
--- a/src/Specific/solinas64_2e321m9/freezeDisplay.log
+++ b/src/Specific/solinas64_2e321m9/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0x1fffffffffffff);
  uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0x3fffffffffffff);
  uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0x1fffffffffffff);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0x3ffffffffffff7);
  uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint64_t x34 = (x29 & 0x1fffffffffffff);
diff --git a/src/Specific/solinas64_2e322m2e161m1/freeze.c b/src/Specific/solinas64_2e322m2e161m1/freeze.c
index 7361e059f..f9314590d 100644
--- a/src/Specific/solinas64_2e322m2e161m1/freeze.c
+++ b/src/Specific/solinas64_2e322m2e161m1/freeze.c
@@ -13,7 +13,7 @@ static void freeze(uint64_t out[7], const uint64_t in1[7]) {
   { uint64_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x24, Return x10, 0x3fffffffffff);
   { uint64_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x27, Return x12, 0x3fffffffffff);
   { uint64_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x30, Return x11, 0x3fffffffffff);
-  { uint64_t x34 = (uint64_t)cmovznz(x33, 0x0, 0xffffffffffffffffL);
+  { uint64_t x34 = cmovznz64(x33, 0x0, 0xffffffffffffffffL);
   { uint64_t x35 = (x34 & 0x3fffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
   { uint64_t x39 = (x34 & 0x3fffffffffff);
diff --git a/src/Specific/solinas64_2e322m2e161m1/freezeDisplay.log b/src/Specific/solinas64_2e322m2e161m1/freezeDisplay.log
index fdaa658a8..08f806634 100644
--- a/src/Specific/solinas64_2e322m2e161m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e322m2e161m1/freezeDisplay.log
@@ -9,7 +9,7 @@ Interp-η
  uint64_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x24, Return x10, 0x3fffffffffff);
  uint64_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x27, Return x12, 0x3fffffffffff);
  uint64_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x30, Return x11, 0x3fffffffffff);
- uint64_t x34 = (uint64_t)cmovznz(x33, 0x0, 0xffffffffffffffffL);
+ uint64_t x34 = cmovznz64(x33, 0x0, 0xffffffffffffffffL);
  uint64_t x35 = (x34 & 0x3fffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
  uint64_t x39 = (x34 & 0x3fffffffffff);
diff --git a/src/Specific/solinas64_2e336m17/freeze.c b/src/Specific/solinas64_2e336m17/freeze.c
index 2ea95eb06..ff74991e3 100644
--- a/src/Specific/solinas64_2e336m17/freeze.c
+++ b/src/Specific/solinas64_2e336m17/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0xffffffffffffff);
   { uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0xffffffffffffff);
   { uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0xffffffffffffff);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xffffffffffffef);
   { uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint64_t x34 = (x29 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e336m17/freezeDisplay.log b/src/Specific/solinas64_2e336m17/freezeDisplay.log
index 76220c7ca..d1153b6c6 100644
--- a/src/Specific/solinas64_2e336m17/freezeDisplay.log
+++ b/src/Specific/solinas64_2e336m17/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0xffffffffffffff);
  uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0xffffffffffffff);
  uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0xffffffffffffff);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xffffffffffffef);
  uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint64_t x34 = (x29 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e336m3/freeze.c b/src/Specific/solinas64_2e336m3/freeze.c
index c42f18310..41a597f18 100644
--- a/src/Specific/solinas64_2e336m3/freeze.c
+++ b/src/Specific/solinas64_2e336m3/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0xffffffffffffff);
   { uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0xffffffffffffff);
   { uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0xffffffffffffff);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0xfffffffffffffd);
   { uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint64_t x34 = (x29 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e336m3/freezeDisplay.log b/src/Specific/solinas64_2e336m3/freezeDisplay.log
index a8c36644a..64e67c28c 100644
--- a/src/Specific/solinas64_2e336m3/freezeDisplay.log
+++ b/src/Specific/solinas64_2e336m3/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0xffffffffffffff);
  uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0xffffffffffffff);
  uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0xffffffffffffff);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0xfffffffffffffd);
  uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint64_t x34 = (x29 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e338m15/freeze.c b/src/Specific/solinas64_2e338m15/freeze.c
index 3a6a3e217..9163faff6 100644
--- a/src/Specific/solinas64_2e338m15/freeze.c
+++ b/src/Specific/solinas64_2e338m15/freeze.c
@@ -11,7 +11,7 @@ static void freeze(uint64_t out[6], const uint64_t in1[6]) {
   { uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0x1ffffffffffffff);
   { uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0xffffffffffffff);
   { uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0xffffffffffffff);
-  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
   { uint64_t x30 = (x29 & 0x1fffffffffffff1);
   { uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
   { uint64_t x34 = (x29 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e338m15/freezeDisplay.log b/src/Specific/solinas64_2e338m15/freezeDisplay.log
index 112d72e48..d2d9556a4 100644
--- a/src/Specific/solinas64_2e338m15/freezeDisplay.log
+++ b/src/Specific/solinas64_2e338m15/freezeDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0x1ffffffffffffff);
  uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0xffffffffffffff);
  uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0xffffffffffffff);
- uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+ uint64_t x29 = cmovznz64(x28, 0x0, 0xffffffffffffffffL);
  uint64_t x30 = (x29 & 0x1fffffffffffff1);
  uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
  uint64_t x34 = (x29 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e369m25/freeze.c b/src/Specific/solinas64_2e369m25/freeze.c
index 3a9c4c13b..975828002 100644
--- a/src/Specific/solinas64_2e369m25/freeze.c
+++ b/src/Specific/solinas64_2e369m25/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0x3fffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0x3fffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0x3fffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0x7fffffffffe7);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x44 = (x39 & 0x3fffffffffff);
diff --git a/src/Specific/solinas64_2e369m25/freezeDisplay.log b/src/Specific/solinas64_2e369m25/freezeDisplay.log
index 52a4c8379..576115614 100644
--- a/src/Specific/solinas64_2e369m25/freezeDisplay.log
+++ b/src/Specific/solinas64_2e369m25/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0x3fffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0x3fffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0x3fffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0x7fffffffffe7);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 47 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x44 = (x39 & 0x3fffffffffff);
diff --git a/src/Specific/solinas64_2e379m19/freeze.c b/src/Specific/solinas64_2e379m19/freeze.c
index 0e60a39c6..f1a2abbfb 100644
--- a/src/Specific/solinas64_2e379m19/freeze.c
+++ b/src/Specific/solinas64_2e379m19/freeze.c
@@ -13,7 +13,7 @@ static void freeze(uint64_t out[7], const uint64_t in1[7]) {
   { uint64_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x24, Return x10, 0x3fffffffffffff);
   { uint64_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x27, Return x12, 0x3fffffffffffff);
   { uint64_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x30, Return x11, 0x3fffffffffffff);
-  { uint64_t x34 = (uint64_t)cmovznz(x33, 0x0, 0xffffffffffffffffL);
+  { uint64_t x34 = cmovznz64(x33, 0x0, 0xffffffffffffffffL);
   { uint64_t x35 = (x34 & 0x7fffffffffffed);
   { uint64_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
   { uint64_t x39 = (x34 & 0x3fffffffffffff);
diff --git a/src/Specific/solinas64_2e379m19/freezeDisplay.log b/src/Specific/solinas64_2e379m19/freezeDisplay.log
index 73e4141de..bd8d59c3b 100644
--- a/src/Specific/solinas64_2e379m19/freezeDisplay.log
+++ b/src/Specific/solinas64_2e379m19/freezeDisplay.log
@@ -9,7 +9,7 @@ Interp-η
  uint64_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x24, Return x10, 0x3fffffffffffff);
  uint64_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x27, Return x12, 0x3fffffffffffff);
  uint64_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x30, Return x11, 0x3fffffffffffff);
- uint64_t x34 = (uint64_t)cmovznz(x33, 0x0, 0xffffffffffffffffL);
+ uint64_t x34 = cmovznz64(x33, 0x0, 0xffffffffffffffffL);
  uint64_t x35 = (x34 & 0x7fffffffffffed);
  uint64_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
  uint64_t x39 = (x34 & 0x3fffffffffffff);
diff --git a/src/Specific/solinas64_2e382m105/freeze.c b/src/Specific/solinas64_2e382m105/freeze.c
index 78db27697..ef05f2f5a 100644
--- a/src/Specific/solinas64_2e382m105/freeze.c
+++ b/src/Specific/solinas64_2e382m105/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint64_t out[10], const uint64_t in1[10]) {
   { uint64_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x39, Return x16, 0x3fffffffff);
   { uint64_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x42, Return x18, 0x3fffffffff);
   { uint64_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x45, Return x17, 0x3fffffffff);
-  { uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+  { uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
   { uint64_t x50 = (x49 & 0x7fffffff97);
   { uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 39 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint64_t x54 = (x49 & 0x3fffffffff);
diff --git a/src/Specific/solinas64_2e382m105/freezeDisplay.log b/src/Specific/solinas64_2e382m105/freezeDisplay.log
index f4f01d049..7c9373d9c 100644
--- a/src/Specific/solinas64_2e382m105/freezeDisplay.log
+++ b/src/Specific/solinas64_2e382m105/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint64_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x39, Return x16, 0x3fffffffff);
  uint64_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x42, Return x18, 0x3fffffffff);
  uint64_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x45, Return x17, 0x3fffffffff);
- uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+ uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
  uint64_t x50 = (x49 & 0x7fffffff97);
  uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 39 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint64_t x54 = (x49 & 0x3fffffffff);
diff --git a/src/Specific/solinas64_2e384m2e128m2e96p2e32m1/freeze.c b/src/Specific/solinas64_2e384m2e128m2e96p2e32m1/freeze.c
index 1c04c8171..dc50d30d8 100644
--- a/src/Specific/solinas64_2e384m2e128m2e96p2e32m1/freeze.c
+++ b/src/Specific/solinas64_2e384m2e128m2e96p2e32m1/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0xffffffff);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x45, uint8_t x46 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x43, Return x19, 0x0);
diff --git a/src/Specific/solinas64_2e384m2e128m2e96p2e32m1/freezeDisplay.log b/src/Specific/solinas64_2e384m2e128m2e96p2e32m1/freezeDisplay.log
index 394835316..c67300686 100644
--- a/src/Specific/solinas64_2e384m2e128m2e96p2e32m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e384m2e128m2e96p2e32m1/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0xffffffff);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x45, uint8_t x46 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x43, Return x19, 0x0);
diff --git a/src/Specific/solinas64_2e384m317/freeze.c b/src/Specific/solinas64_2e384m317/freeze.c
index 810814cd5..c037a517a 100644
--- a/src/Specific/solinas64_2e384m317/freeze.c
+++ b/src/Specific/solinas64_2e384m317/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0xfffffffffec3);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x44 = (x39 & 0xffffffffffff);
diff --git a/src/Specific/solinas64_2e384m317/freezeDisplay.log b/src/Specific/solinas64_2e384m317/freezeDisplay.log
index 9c49548af..c7cb86cad 100644
--- a/src/Specific/solinas64_2e384m317/freezeDisplay.log
+++ b/src/Specific/solinas64_2e384m317/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0xfffffffffec3);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x44 = (x39 & 0xffffffffffff);
diff --git a/src/Specific/solinas64_2e384m5x2e368m1/freeze.c b/src/Specific/solinas64_2e384m5x2e368m1/freeze.c
index 42303c62a..59dc1b18d 100644
--- a/src/Specific/solinas64_2e384m5x2e368m1/freeze.c
+++ b/src/Specific/solinas64_2e384m5x2e368m1/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xfffaffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0xffffffffffff);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x44 = (x39 & 0xffffffffffff);
diff --git a/src/Specific/solinas64_2e384m5x2e368m1/freezeDisplay.log b/src/Specific/solinas64_2e384m5x2e368m1/freezeDisplay.log
index f4a0013b4..6768fe30c 100644
--- a/src/Specific/solinas64_2e384m5x2e368m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e384m5x2e368m1/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xfffaffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0xffffffffffff);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x44 = (x39 & 0xffffffffffff);
diff --git a/src/Specific/solinas64_2e384m79x2e376m1/freeze.c b/src/Specific/solinas64_2e384m79x2e376m1/freeze.c
index 4c264cc11..270b845ec 100644
--- a/src/Specific/solinas64_2e384m79x2e376m1/freeze.c
+++ b/src/Specific/solinas64_2e384m79x2e376m1/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xb0ffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0xffffffffffff);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x44 = (x39 & 0xffffffffffff);
diff --git a/src/Specific/solinas64_2e384m79x2e376m1/freezeDisplay.log b/src/Specific/solinas64_2e384m79x2e376m1/freezeDisplay.log
index f5a3262f3..94e0f473a 100644
--- a/src/Specific/solinas64_2e384m79x2e376m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e384m79x2e376m1/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xb0ffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0xffffffffffff);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 48 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x44 = (x39 & 0xffffffffffff);
diff --git a/src/Specific/solinas64_2e401m31/freeze.c b/src/Specific/solinas64_2e401m31/freeze.c
index 7801ee0b8..2bc280725 100644
--- a/src/Specific/solinas64_2e401m31/freeze.c
+++ b/src/Specific/solinas64_2e401m31/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0x3ffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0x3ffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0x3ffffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0x7ffffffffffe1);
   { uint64_t x42; uint8_t x43 = _addcarryx_u51(0x0, x16, x40, &x42);
   { uint64_t x44 = (x39 & 0x3ffffffffffff);
diff --git a/src/Specific/solinas64_2e401m31/freezeDisplay.log b/src/Specific/solinas64_2e401m31/freezeDisplay.log
index d1baed290..b4ce1612e 100644
--- a/src/Specific/solinas64_2e401m31/freezeDisplay.log
+++ b/src/Specific/solinas64_2e401m31/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0x3ffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0x3ffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 50 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0x3ffffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0x7ffffffffffe1);
  uint64_t x42, uint8_t x43 = addcarryx_u51(0x0, x16, x40);
  uint64_t x44 = (x39 & 0x3ffffffffffff);
diff --git a/src/Specific/solinas64_2e413m21/freeze.c b/src/Specific/solinas64_2e413m21/freeze.c
index 82ad82e84..8d63463bc 100644
--- a/src/Specific/solinas64_2e413m21/freeze.c
+++ b/src/Specific/solinas64_2e413m21/freeze.c
@@ -13,7 +13,7 @@ static void freeze(uint64_t out[7], const uint64_t in1[7]) {
   { uint64_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x24, Return x10, 0x7ffffffffffffff);
   { uint64_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x27, Return x12, 0x7ffffffffffffff);
   { uint64_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x30, Return x11, 0x7ffffffffffffff);
-  { uint64_t x34 = (uint64_t)cmovznz(x33, 0x0, 0xffffffffffffffffL);
+  { uint64_t x34 = cmovznz64(x33, 0x0, 0xffffffffffffffffL);
   { uint64_t x35 = (x34 & 0x7ffffffffffffeb);
   { uint64_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
   { uint64_t x39 = (x34 & 0x7ffffffffffffff);
diff --git a/src/Specific/solinas64_2e413m21/freezeDisplay.log b/src/Specific/solinas64_2e413m21/freezeDisplay.log
index 40030c555..e69dc348c 100644
--- a/src/Specific/solinas64_2e413m21/freezeDisplay.log
+++ b/src/Specific/solinas64_2e413m21/freezeDisplay.log
@@ -9,7 +9,7 @@ Interp-η
  uint64_t x26, uint8_t x27 = Op (Syntax.SubWithGetBorrow 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x24, Return x10, 0x7ffffffffffffff);
  uint64_t x29, uint8_t x30 = Op (Syntax.SubWithGetBorrow 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x27, Return x12, 0x7ffffffffffffff);
  uint64_t x32, uint8_t x33 = Op (Syntax.SubWithGetBorrow 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x30, Return x11, 0x7ffffffffffffff);
- uint64_t x34 = (uint64_t)cmovznz(x33, 0x0, 0xffffffffffffffffL);
+ uint64_t x34 = cmovznz64(x33, 0x0, 0xffffffffffffffffL);
  uint64_t x35 = (x34 & 0x7ffffffffffffeb);
  uint64_t x37, uint8_t x38 = Op (Syntax.AddWithGetCarry 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x14, Return x35);
  uint64_t x39 = (x34 & 0x7ffffffffffffff);
diff --git a/src/Specific/solinas64_2e414m17/freeze.c b/src/Specific/solinas64_2e414m17/freeze.c
index 10cbf785a..28c8008cd 100644
--- a/src/Specific/solinas64_2e414m17/freeze.c
+++ b/src/Specific/solinas64_2e414m17/freeze.c
@@ -17,7 +17,7 @@ static void freeze(uint64_t out[9], const uint64_t in1[9]) {
   { uint64_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x34, Return x14, 0x3fffffffffff);
   { uint64_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x37, Return x16, 0x3fffffffffff);
   { uint64_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x40, Return x15, 0x3fffffffffff);
-  { uint64_t x44 = (uint64_t)cmovznz(x43, 0x0, 0xffffffffffffffffL);
+  { uint64_t x44 = cmovznz64(x43, 0x0, 0xffffffffffffffffL);
   { uint64_t x45 = (x44 & 0x3fffffffffef);
   { uint64_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
   { uint64_t x49 = (x44 & 0x3fffffffffff);
diff --git a/src/Specific/solinas64_2e414m17/freezeDisplay.log b/src/Specific/solinas64_2e414m17/freezeDisplay.log
index e0a2a97c5..bb142d9dd 100644
--- a/src/Specific/solinas64_2e414m17/freezeDisplay.log
+++ b/src/Specific/solinas64_2e414m17/freezeDisplay.log
@@ -11,7 +11,7 @@ Interp-η
  uint64_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x34, Return x14, 0x3fffffffffff);
  uint64_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x37, Return x16, 0x3fffffffffff);
  uint64_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x40, Return x15, 0x3fffffffffff);
- uint64_t x44 = (uint64_t)cmovznz(x43, 0x0, 0xffffffffffffffffL);
+ uint64_t x44 = cmovznz64(x43, 0x0, 0xffffffffffffffffL);
  uint64_t x45 = (x44 & 0x3fffffffffef);
  uint64_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 46 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
  uint64_t x49 = (x44 & 0x3fffffffffff);
diff --git a/src/Specific/solinas64_2e416m2e208m1/freeze.c b/src/Specific/solinas64_2e416m2e208m1/freeze.c
index f704b6f38..9c2472af2 100644
--- a/src/Specific/solinas64_2e416m2e208m1/freeze.c
+++ b/src/Specific/solinas64_2e416m2e208m1/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xfffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xfffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xfffffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0xfffffffffffff);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x44 = (x39 & 0xfffffffffffff);
diff --git a/src/Specific/solinas64_2e416m2e208m1/freezeDisplay.log b/src/Specific/solinas64_2e416m2e208m1/freezeDisplay.log
index 7ee94c920..69c2c9bb3 100644
--- a/src/Specific/solinas64_2e416m2e208m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e416m2e208m1/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xfffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xfffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xfffffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0xfffffffffffff);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x44 = (x39 & 0xfffffffffffff);
diff --git a/src/Specific/solinas64_2e444m17/freeze.c b/src/Specific/solinas64_2e444m17/freeze.c
index cbf2315ef..0d9ba24b8 100644
--- a/src/Specific/solinas64_2e444m17/freeze.c
+++ b/src/Specific/solinas64_2e444m17/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0x7fffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0x7fffffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0xffffffffffffef);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x44 = (x39 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e444m17/freezeDisplay.log b/src/Specific/solinas64_2e444m17/freezeDisplay.log
index 025251dc8..dc8ee9522 100644
--- a/src/Specific/solinas64_2e444m17/freezeDisplay.log
+++ b/src/Specific/solinas64_2e444m17/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0x7fffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0x7fffffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0xffffffffffffef);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x44 = (x39 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e448m2e224m1/freeze.c b/src/Specific/solinas64_2e448m2e224m1/freeze.c
index 37fc5f7d3..e59953182 100644
--- a/src/Specific/solinas64_2e448m2e224m1/freeze.c
+++ b/src/Specific/solinas64_2e448m2e224m1/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0xffffffffffffff);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x44 = (x39 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e448m2e224m1/freezeDisplay.log b/src/Specific/solinas64_2e448m2e224m1/freezeDisplay.log
index 0a0474d75..1dfd2b0cb 100644
--- a/src/Specific/solinas64_2e448m2e224m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e448m2e224m1/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0xffffffffffffff);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x44 = (x39 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e450m2e225m1/freeze.c b/src/Specific/solinas64_2e450m2e225m1/freeze.c
index 22814aaca..064b11eba 100644
--- a/src/Specific/solinas64_2e450m2e225m1/freeze.c
+++ b/src/Specific/solinas64_2e450m2e225m1/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0x1ffffffffffffff);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x44 = (x39 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e450m2e225m1/freezeDisplay.log b/src/Specific/solinas64_2e450m2e225m1/freezeDisplay.log
index b9084313e..50e964eeb 100644
--- a/src/Specific/solinas64_2e450m2e225m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e450m2e225m1/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xffffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0x1ffffffffffffff);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x44 = (x39 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e452m3/freeze.c b/src/Specific/solinas64_2e452m3/freeze.c
index f54bffc77..6af79c058 100644
--- a/src/Specific/solinas64_2e452m3/freeze.c
+++ b/src/Specific/solinas64_2e452m3/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0x1ffffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0x1fffffffffffffd);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x44 = (x39 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e452m3/freezeDisplay.log b/src/Specific/solinas64_2e452m3/freezeDisplay.log
index 65a0d09a1..b2eeefa09 100644
--- a/src/Specific/solinas64_2e452m3/freezeDisplay.log
+++ b/src/Specific/solinas64_2e452m3/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xffffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0x1ffffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xffffffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0x1fffffffffffffd);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 57 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x44 = (x39 & 0xffffffffffffff);
diff --git a/src/Specific/solinas64_2e468m17/freeze.c b/src/Specific/solinas64_2e468m17/freeze.c
index 842d0a1cf..a623a2a1e 100644
--- a/src/Specific/solinas64_2e468m17/freeze.c
+++ b/src/Specific/solinas64_2e468m17/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0x3ffffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0x7ffffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0x3ffffffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0x7ffffffffffffef);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x44 = (x39 & 0x3ffffffffffffff);
diff --git a/src/Specific/solinas64_2e468m17/freezeDisplay.log b/src/Specific/solinas64_2e468m17/freezeDisplay.log
index e4c29b54b..f54fa802d 100644
--- a/src/Specific/solinas64_2e468m17/freezeDisplay.log
+++ b/src/Specific/solinas64_2e468m17/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0x3ffffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0x7ffffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 58 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0x3ffffffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0x7ffffffffffffef);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 59 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x44 = (x39 & 0x3ffffffffffffff);
diff --git a/src/Specific/solinas64_2e480m2e240m1/freeze.c b/src/Specific/solinas64_2e480m2e240m1/freeze.c
index adedd4cd2..3173ddc8a 100644
--- a/src/Specific/solinas64_2e480m2e240m1/freeze.c
+++ b/src/Specific/solinas64_2e480m2e240m1/freeze.c
@@ -15,7 +15,7 @@ static void freeze(uint64_t out[8], const uint64_t in1[8]) {
   { uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 60 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xfffffffffffffff);
   { uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 60 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xfffffffffffffff);
   { uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 60 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xfffffffffffffff);
-  { uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+  { uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
   { uint64_t x40 = (x39 & 0xfffffffffffffff);
   { uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 60 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
   { uint64_t x44 = (x39 & 0xfffffffffffffff);
diff --git a/src/Specific/solinas64_2e480m2e240m1/freezeDisplay.log b/src/Specific/solinas64_2e480m2e240m1/freezeDisplay.log
index eca3d9535..44be6a8b2 100644
--- a/src/Specific/solinas64_2e480m2e240m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e480m2e240m1/freezeDisplay.log
@@ -10,7 +10,7 @@ Interp-η
  uint64_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 60 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x29, Return x12, 0xfffffffffffffff);
  uint64_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 60 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x32, Return x14, 0xfffffffffffffff);
  uint64_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 60 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x35, Return x13, 0xfffffffffffffff);
- uint64_t x39 = (uint64_t)cmovznz(x38, 0x0, 0xffffffffffffffffL);
+ uint64_t x39 = cmovznz64(x38, 0x0, 0xffffffffffffffffL);
  uint64_t x40 = (x39 & 0xfffffffffffffff);
  uint64_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 60 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
  uint64_t x44 = (x39 & 0xfffffffffffffff);
diff --git a/src/Specific/solinas64_2e488m17/freeze.c b/src/Specific/solinas64_2e488m17/freeze.c
index c12930031..bea32443d 100644
--- a/src/Specific/solinas64_2e488m17/freeze.c
+++ b/src/Specific/solinas64_2e488m17/freeze.c
@@ -31,7 +31,7 @@ static void freeze(uint64_t out[16], const uint64_t in1[16]) {
   { uint64_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x69, Return x28, 0x3fffffff);
   { uint64_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 31 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x72, Return x30, 0x7fffffff);
   { uint64_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x75, Return x29, 0x3fffffff);
-  { uint64_t x79 = (uint64_t)cmovznz(x78, 0x0, 0xffffffffffffffffL);
+  { uint64_t x79 = cmovznz64(x78, 0x0, 0xffffffffffffffffL);
   { uint64_t x80 = (x79 & 0x7fffffef);
   { uint64_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 31 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
   { uint64_t x84 = (x79 & 0x3fffffff);
diff --git a/src/Specific/solinas64_2e488m17/freezeDisplay.log b/src/Specific/solinas64_2e488m17/freezeDisplay.log
index 1eee2de0a..a3b817e40 100644
--- a/src/Specific/solinas64_2e488m17/freezeDisplay.log
+++ b/src/Specific/solinas64_2e488m17/freezeDisplay.log
@@ -18,7 +18,7 @@ Interp-η
  uint64_t x71, uint8_t x72 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x69, Return x28, 0x3fffffff);
  uint64_t x74, uint8_t x75 = Op (Syntax.SubWithGetBorrow 31 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x72, Return x30, 0x7fffffff);
  uint64_t x77, uint8_t x78 = Op (Syntax.SubWithGetBorrow 30 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x75, Return x29, 0x3fffffff);
- uint64_t x79 = (uint64_t)cmovznz(x78, 0x0, 0xffffffffffffffffL);
+ uint64_t x79 = cmovznz64(x78, 0x0, 0xffffffffffffffffL);
  uint64_t x80 = (x79 & 0x7fffffef);
  uint64_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 31 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x32, Return x80);
  uint64_t x84 = (x79 & 0x3fffffff);
diff --git a/src/Specific/solinas64_2e489m21/freeze.c b/src/Specific/solinas64_2e489m21/freeze.c
index 0b5c3eb3c..2c2696083 100644
--- a/src/Specific/solinas64_2e489m21/freeze.c
+++ b/src/Specific/solinas64_2e489m21/freeze.c
@@ -17,7 +17,7 @@ static void freeze(uint64_t out[9], const uint64_t in1[9]) {
   { uint64_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x34, Return x14, 0x7fffffffffffff);
   { uint64_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x37, Return x16, 0x3fffffffffffff);
   { uint64_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x40, Return x15, 0x3fffffffffffff);
-  { uint64_t x44 = (uint64_t)cmovznz(x43, 0x0, 0xffffffffffffffffL);
+  { uint64_t x44 = cmovznz64(x43, 0x0, 0xffffffffffffffffL);
   { uint64_t x45 = (x44 & 0x7fffffffffffeb);
   { uint64_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
   { uint64_t x49 = (x44 & 0x3fffffffffffff);
diff --git a/src/Specific/solinas64_2e489m21/freezeDisplay.log b/src/Specific/solinas64_2e489m21/freezeDisplay.log
index 12e65dbe5..890bbfd27 100644
--- a/src/Specific/solinas64_2e489m21/freezeDisplay.log
+++ b/src/Specific/solinas64_2e489m21/freezeDisplay.log
@@ -11,7 +11,7 @@ Interp-η
  uint64_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x34, Return x14, 0x7fffffffffffff);
  uint64_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x37, Return x16, 0x3fffffffffffff);
  uint64_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 54 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x40, Return x15, 0x3fffffffffffff);
- uint64_t x44 = (uint64_t)cmovznz(x43, 0x0, 0xffffffffffffffffL);
+ uint64_t x44 = cmovznz64(x43, 0x0, 0xffffffffffffffffL);
  uint64_t x45 = (x44 & 0x7fffffffffffeb);
  uint64_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
  uint64_t x49 = (x44 & 0x3fffffffffffff);
diff --git a/src/Specific/solinas64_2e495m31/freeze.c b/src/Specific/solinas64_2e495m31/freeze.c
index ea6896c00..c373d5d40 100644
--- a/src/Specific/solinas64_2e495m31/freeze.c
+++ b/src/Specific/solinas64_2e495m31/freeze.c
@@ -17,7 +17,7 @@ static void freeze(uint64_t out[9], const uint64_t in1[9]) {
   { uint64_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x34, Return x14, 0x7fffffffffffff);
   { uint64_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x37, Return x16, 0x7fffffffffffff);
   { uint64_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x40, Return x15, 0x7fffffffffffff);
-  { uint64_t x44 = (uint64_t)cmovznz(x43, 0x0, 0xffffffffffffffffL);
+  { uint64_t x44 = cmovznz64(x43, 0x0, 0xffffffffffffffffL);
   { uint64_t x45 = (x44 & 0x7fffffffffffe1);
   { uint64_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
   { uint64_t x49 = (x44 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e495m31/freezeDisplay.log b/src/Specific/solinas64_2e495m31/freezeDisplay.log
index bf754bb88..a60ee6bdd 100644
--- a/src/Specific/solinas64_2e495m31/freezeDisplay.log
+++ b/src/Specific/solinas64_2e495m31/freezeDisplay.log
@@ -11,7 +11,7 @@ Interp-η
  uint64_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x34, Return x14, 0x7fffffffffffff);
  uint64_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x37, Return x16, 0x7fffffffffffff);
  uint64_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x40, Return x15, 0x7fffffffffffff);
- uint64_t x44 = (uint64_t)cmovznz(x43, 0x0, 0xffffffffffffffffL);
+ uint64_t x44 = cmovznz64(x43, 0x0, 0xffffffffffffffffL);
  uint64_t x45 = (x44 & 0x7fffffffffffe1);
  uint64_t x47, uint8_t x48 = Op (Syntax.AddWithGetCarry 55 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x18, Return x45);
  uint64_t x49 = (x44 & 0x7fffffffffffff);
diff --git a/src/Specific/solinas64_2e510m290x2e496m1/freeze.c b/src/Specific/solinas64_2e510m290x2e496m1/freeze.c
index 68338738f..c70e5f86a 100644
--- a/src/Specific/solinas64_2e510m290x2e496m1/freeze.c
+++ b/src/Specific/solinas64_2e510m290x2e496m1/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint64_t out[10], const uint64_t in1[10]) {
   { uint64_t x41; uint8_t x42 = _subborrow_u51(x39, x16, 0x7ffffffffffff, &x41);
   { uint64_t x44; uint8_t x45 = _subborrow_u51(x42, x18, 0x7ffffffffffff, &x44);
   { uint64_t x47; uint8_t x48 = _subborrow_u51(x45, x17, 0x7dbbfffffffff, &x47);
-  { uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+  { uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
   { uint64_t x50 = (x49 & 0x7ffffffffffff);
   { uint64_t x52; uint8_t x53 = _addcarryx_u51(0x0, x20, x50, &x52);
   { uint64_t x54 = (x49 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e510m290x2e496m1/freezeDisplay.log b/src/Specific/solinas64_2e510m290x2e496m1/freezeDisplay.log
index 8d92f8c6a..311cabf02 100644
--- a/src/Specific/solinas64_2e510m290x2e496m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e510m290x2e496m1/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint64_t x41, uint8_t x42 = subborrow_u51(x39, x16, 0x7ffffffffffff);
  uint64_t x44, uint8_t x45 = subborrow_u51(x42, x18, 0x7ffffffffffff);
  uint64_t x47, uint8_t x48 = subborrow_u51(x45, x17, 0x7dbbfffffffff);
- uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+ uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
  uint64_t x50 = (x49 & 0x7ffffffffffff);
  uint64_t x52, uint8_t x53 = addcarryx_u51(0x0, x20, x50);
  uint64_t x54 = (x49 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e511m187/freeze.c b/src/Specific/solinas64_2e511m187/freeze.c
index b6e52d9b9..05758b2b3 100644
--- a/src/Specific/solinas64_2e511m187/freeze.c
+++ b/src/Specific/solinas64_2e511m187/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint64_t out[10], const uint64_t in1[10]) {
   { uint64_t x41; uint8_t x42 = _subborrow_u51(x39, x16, 0x7ffffffffffff, &x41);
   { uint64_t x44; uint8_t x45 = _subborrow_u51(x42, x18, 0x7ffffffffffff, &x44);
   { uint64_t x47; uint8_t x48 = _subborrow_u51(x45, x17, 0x7ffffffffffff, &x47);
-  { uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+  { uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
   { uint64_t x50 = (x49 & 0xfffffffffff45);
   { uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint64_t x54 = (x49 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e511m187/freezeDisplay.log b/src/Specific/solinas64_2e511m187/freezeDisplay.log
index 80e06aed9..1dd7de935 100644
--- a/src/Specific/solinas64_2e511m187/freezeDisplay.log
+++ b/src/Specific/solinas64_2e511m187/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint64_t x41, uint8_t x42 = subborrow_u51(x39, x16, 0x7ffffffffffff);
  uint64_t x44, uint8_t x45 = subborrow_u51(x42, x18, 0x7ffffffffffff);
  uint64_t x47, uint8_t x48 = subborrow_u51(x45, x17, 0x7ffffffffffff);
- uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+ uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
  uint64_t x50 = (x49 & 0xfffffffffff45);
  uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint64_t x54 = (x49 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e511m481/freeze.c b/src/Specific/solinas64_2e511m481/freeze.c
index ff8df981d..63f51d9d3 100644
--- a/src/Specific/solinas64_2e511m481/freeze.c
+++ b/src/Specific/solinas64_2e511m481/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint64_t out[10], const uint64_t in1[10]) {
   { uint64_t x41; uint8_t x42 = _subborrow_u51(x39, x16, 0x7ffffffffffff, &x41);
   { uint64_t x44; uint8_t x45 = _subborrow_u51(x42, x18, 0x7ffffffffffff, &x44);
   { uint64_t x47; uint8_t x48 = _subborrow_u51(x45, x17, 0x7ffffffffffff, &x47);
-  { uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+  { uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
   { uint64_t x50 = (x49 & 0xffffffffffe1f);
   { uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint64_t x54 = (x49 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e511m481/freezeDisplay.log b/src/Specific/solinas64_2e511m481/freezeDisplay.log
index 778329bf8..07b785068 100644
--- a/src/Specific/solinas64_2e511m481/freezeDisplay.log
+++ b/src/Specific/solinas64_2e511m481/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint64_t x41, uint8_t x42 = subborrow_u51(x39, x16, 0x7ffffffffffff);
  uint64_t x44, uint8_t x45 = subborrow_u51(x42, x18, 0x7ffffffffffff);
  uint64_t x47, uint8_t x48 = subborrow_u51(x45, x17, 0x7ffffffffffff);
- uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+ uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
  uint64_t x50 = (x49 & 0xffffffffffe1f);
  uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint64_t x54 = (x49 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e512m491x2e496m1/freeze.c b/src/Specific/solinas64_2e512m491x2e496m1/freeze.c
index 4d6d97806..f0903fd8e 100644
--- a/src/Specific/solinas64_2e512m491x2e496m1/freeze.c
+++ b/src/Specific/solinas64_2e512m491x2e496m1/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint64_t out[10], const uint64_t in1[10]) {
   { uint64_t x41; uint8_t x42 = _subborrow_u51(x39, x16, 0x7ffffffffffff, &x41);
   { uint64_t x44; uint8_t x45 = _subborrow_u51(x42, x18, 0x7ffffffffffff, &x44);
   { uint64_t x47; uint8_t x48 = _subborrow_u51(x45, x17, 0x7f0a7ffffffff, &x47);
-  { uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+  { uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
   { uint64_t x50 = (x49 & 0xfffffffffffff);
   { uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint64_t x54 = (x49 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e512m491x2e496m1/freezeDisplay.log b/src/Specific/solinas64_2e512m491x2e496m1/freezeDisplay.log
index c086f7ec6..a32e03130 100644
--- a/src/Specific/solinas64_2e512m491x2e496m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e512m491x2e496m1/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint64_t x41, uint8_t x42 = subborrow_u51(x39, x16, 0x7ffffffffffff);
  uint64_t x44, uint8_t x45 = subborrow_u51(x42, x18, 0x7ffffffffffff);
  uint64_t x47, uint8_t x48 = subborrow_u51(x45, x17, 0x7f0a7ffffffff);
- uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+ uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
  uint64_t x50 = (x49 & 0xfffffffffffff);
  uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint64_t x54 = (x49 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e512m569/freeze.c b/src/Specific/solinas64_2e512m569/freeze.c
index af890dae2..6f4db7541 100644
--- a/src/Specific/solinas64_2e512m569/freeze.c
+++ b/src/Specific/solinas64_2e512m569/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint64_t out[10], const uint64_t in1[10]) {
   { uint64_t x41; uint8_t x42 = _subborrow_u51(x39, x16, 0x7ffffffffffff, &x41);
   { uint64_t x44; uint8_t x45 = _subborrow_u51(x42, x18, 0x7ffffffffffff, &x44);
   { uint64_t x47; uint8_t x48 = _subborrow_u51(x45, x17, 0x7ffffffffffff, &x47);
-  { uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+  { uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
   { uint64_t x50 = (x49 & 0xffffffffffdc7);
   { uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint64_t x54 = (x49 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e512m569/freezeDisplay.log b/src/Specific/solinas64_2e512m569/freezeDisplay.log
index 59e5bbcf0..c78c962ee 100644
--- a/src/Specific/solinas64_2e512m569/freezeDisplay.log
+++ b/src/Specific/solinas64_2e512m569/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint64_t x41, uint8_t x42 = subborrow_u51(x39, x16, 0x7ffffffffffff);
  uint64_t x44, uint8_t x45 = subborrow_u51(x42, x18, 0x7ffffffffffff);
  uint64_t x47, uint8_t x48 = subborrow_u51(x45, x17, 0x7ffffffffffff);
- uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+ uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
  uint64_t x50 = (x49 & 0xffffffffffdc7);
  uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint64_t x54 = (x49 & 0x7ffffffffffff);
diff --git a/src/Specific/solinas64_2e521m1/freeze.c b/src/Specific/solinas64_2e521m1/freeze.c
index 3f8e4457a..da704fa48 100644
--- a/src/Specific/solinas64_2e521m1/freeze.c
+++ b/src/Specific/solinas64_2e521m1/freeze.c
@@ -19,7 +19,7 @@ static void freeze(uint64_t out[10], const uint64_t in1[10]) {
   { uint64_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x39, Return x16, 0xfffffffffffff);
   { uint64_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x42, Return x18, 0xfffffffffffff);
   { uint64_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x45, Return x17, 0xfffffffffffff);
-  { uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+  { uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
   { uint64_t x50 = (x49 & 0x1fffffffffffff);
   { uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
   { uint64_t x54 = (x49 & 0xfffffffffffff);
diff --git a/src/Specific/solinas64_2e521m1/freezeDisplay.log b/src/Specific/solinas64_2e521m1/freezeDisplay.log
index 0cc189bc1..f4b207247 100644
--- a/src/Specific/solinas64_2e521m1/freezeDisplay.log
+++ b/src/Specific/solinas64_2e521m1/freezeDisplay.log
@@ -12,7 +12,7 @@ Interp-η
  uint64_t x41, uint8_t x42 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x39, Return x16, 0xfffffffffffff);
  uint64_t x44, uint8_t x45 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x42, Return x18, 0xfffffffffffff);
  uint64_t x47, uint8_t x48 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x45, Return x17, 0xfffffffffffff);
- uint64_t x49 = (uint64_t)cmovznz(x48, 0x0, 0xffffffffffffffffL);
+ uint64_t x49 = cmovznz64(x48, 0x0, 0xffffffffffffffffL);
  uint64_t x50 = (x49 & 0x1fffffffffffff);
  uint64_t x52, uint8_t x53 = Op (Syntax.AddWithGetCarry 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x20, Return x50);
  uint64_t x54 = (x49 & 0xfffffffffffff);
author	Jason Gross <jgross@mit.edu>	2017-11-10 18:13:59 -0500
committer	Jason Gross <jgross@mit.edu>	2017-11-10 18:13:59 -0500
commit	1e5b0a76fadd9255a0ead47d1327c628160b01bd (patch)
tree	52c1b30c660dfb0c30f329295b7b46b712b88bb8 /src
parent	6a335b31b69443cfe8ee46308eb94b299929c983 (diff)