Rebuild .c files

It seems some commutativity has changed

1 files changed, 517 insertions, 517 deletions

diff --git a/p224_32.c b/p224_32.c
index 1341276cb..0e0b6ad67 100644
--- a/p224_32.c
+++ b/p224_32.c
@@ -146,25 +146,25 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x20, &x21, x7, (arg2[0]));
   uint32_t x22;
   fiat_p224_uint1 x23;
-  fiat_p224_addcarryx_u32(&x22, &x23, 0x0, x18, x21);
+  fiat_p224_addcarryx_u32(&x22, &x23, 0x0, x21, x18);
   uint32_t x24;
   fiat_p224_uint1 x25;
-  fiat_p224_addcarryx_u32(&x24, &x25, x23, x16, x19);
+  fiat_p224_addcarryx_u32(&x24, &x25, x23, x19, x16);
   uint32_t x26;
   fiat_p224_uint1 x27;
-  fiat_p224_addcarryx_u32(&x26, &x27, x25, x14, x17);
+  fiat_p224_addcarryx_u32(&x26, &x27, x25, x17, x14);
   uint32_t x28;
   fiat_p224_uint1 x29;
-  fiat_p224_addcarryx_u32(&x28, &x29, x27, x12, x15);
+  fiat_p224_addcarryx_u32(&x28, &x29, x27, x15, x12);
   uint32_t x30;
   fiat_p224_uint1 x31;
-  fiat_p224_addcarryx_u32(&x30, &x31, x29, x10, x13);
+  fiat_p224_addcarryx_u32(&x30, &x31, x29, x13, x10);
   uint32_t x32;
   fiat_p224_uint1 x33;
-  fiat_p224_addcarryx_u32(&x32, &x33, x31, x8, x11);
+  fiat_p224_addcarryx_u32(&x32, &x33, x31, x11, x8);
   uint32_t x34;
   fiat_p224_uint1 x35;
-  fiat_p224_addcarryx_u32(&x34, &x35, x33, 0x0, x9);
+  fiat_p224_addcarryx_u32(&x34, &x35, x33, x9, 0x0);
   uint32_t x36;
   uint32_t x37;
   fiat_p224_mulx_u32(&x36, &x37, x20, UINT32_C(0xffffffff));
@@ -182,40 +182,40 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x44, &x45, x36, UINT32_C(0xffffffff));
   uint32_t x46;
   fiat_p224_uint1 x47;
-  fiat_p224_addcarryx_u32(&x46, &x47, 0x0, x42, x45);
+  fiat_p224_addcarryx_u32(&x46, &x47, 0x0, x45, x42);
   uint32_t x48;
   fiat_p224_uint1 x49;
-  fiat_p224_addcarryx_u32(&x48, &x49, x47, x40, x43);
+  fiat_p224_addcarryx_u32(&x48, &x49, x47, x43, x40);
   uint32_t x50;
   fiat_p224_uint1 x51;
-  fiat_p224_addcarryx_u32(&x50, &x51, x49, x38, x41);
+  fiat_p224_addcarryx_u32(&x50, &x51, x49, x41, x38);
   uint32_t x52;
   fiat_p224_uint1 x53;
-  fiat_p224_addcarryx_u32(&x52, &x53, x51, 0x0, x39);
+  fiat_p224_addcarryx_u32(&x52, &x53, x51, x39, 0x0);
   uint32_t x54;
   fiat_p224_uint1 x55;
-  fiat_p224_addcarryx_u32(&x54, &x55, 0x0, x36, x20);
+  fiat_p224_addcarryx_u32(&x54, &x55, 0x0, x20, x36);
   uint32_t x56;
   fiat_p224_uint1 x57;
-  fiat_p224_addcarryx_u32(&x56, &x57, x55, 0x0, x22);
+  fiat_p224_addcarryx_u32(&x56, &x57, x55, x22, 0x0);
   uint32_t x58;
   fiat_p224_uint1 x59;
-  fiat_p224_addcarryx_u32(&x58, &x59, x57, 0x0, x24);
+  fiat_p224_addcarryx_u32(&x58, &x59, x57, x24, 0x0);
   uint32_t x60;
   fiat_p224_uint1 x61;
-  fiat_p224_addcarryx_u32(&x60, &x61, x59, x44, x26);
+  fiat_p224_addcarryx_u32(&x60, &x61, x59, x26, x44);
   uint32_t x62;
   fiat_p224_uint1 x63;
-  fiat_p224_addcarryx_u32(&x62, &x63, x61, x46, x28);
+  fiat_p224_addcarryx_u32(&x62, &x63, x61, x28, x46);
   uint32_t x64;
   fiat_p224_uint1 x65;
-  fiat_p224_addcarryx_u32(&x64, &x65, x63, x48, x30);
+  fiat_p224_addcarryx_u32(&x64, &x65, x63, x30, x48);
   uint32_t x66;
   fiat_p224_uint1 x67;
-  fiat_p224_addcarryx_u32(&x66, &x67, x65, x50, x32);
+  fiat_p224_addcarryx_u32(&x66, &x67, x65, x32, x50);
   uint32_t x68;
   fiat_p224_uint1 x69;
-  fiat_p224_addcarryx_u32(&x68, &x69, x67, x52, x34);
+  fiat_p224_addcarryx_u32(&x68, &x69, x67, x34, x52);
   uint32_t x70;
   fiat_p224_uint1 x71;
   fiat_p224_addcarryx_u32(&x70, &x71, x69, 0x0, 0x0);
@@ -242,49 +242,49 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x84, &x85, x1, (arg2[0]));
   uint32_t x86;
   fiat_p224_uint1 x87;
-  fiat_p224_addcarryx_u32(&x86, &x87, 0x0, x82, x85);
+  fiat_p224_addcarryx_u32(&x86, &x87, 0x0, x85, x82);
   uint32_t x88;
   fiat_p224_uint1 x89;
-  fiat_p224_addcarryx_u32(&x88, &x89, x87, x80, x83);
+  fiat_p224_addcarryx_u32(&x88, &x89, x87, x83, x80);
   uint32_t x90;
   fiat_p224_uint1 x91;
-  fiat_p224_addcarryx_u32(&x90, &x91, x89, x78, x81);
+  fiat_p224_addcarryx_u32(&x90, &x91, x89, x81, x78);
   uint32_t x92;
   fiat_p224_uint1 x93;
-  fiat_p224_addcarryx_u32(&x92, &x93, x91, x76, x79);
+  fiat_p224_addcarryx_u32(&x92, &x93, x91, x79, x76);
   uint32_t x94;
   fiat_p224_uint1 x95;
-  fiat_p224_addcarryx_u32(&x94, &x95, x93, x74, x77);
+  fiat_p224_addcarryx_u32(&x94, &x95, x93, x77, x74);
   uint32_t x96;
   fiat_p224_uint1 x97;
-  fiat_p224_addcarryx_u32(&x96, &x97, x95, x72, x75);
+  fiat_p224_addcarryx_u32(&x96, &x97, x95, x75, x72);
   uint32_t x98;
   fiat_p224_uint1 x99;
-  fiat_p224_addcarryx_u32(&x98, &x99, x97, 0x0, x73);
+  fiat_p224_addcarryx_u32(&x98, &x99, x97, x73, 0x0);
   uint32_t x100;
   fiat_p224_uint1 x101;
-  fiat_p224_addcarryx_u32(&x100, &x101, 0x0, x84, x56);
+  fiat_p224_addcarryx_u32(&x100, &x101, 0x0, x56, x84);
   uint32_t x102;
   fiat_p224_uint1 x103;
-  fiat_p224_addcarryx_u32(&x102, &x103, x101, x86, x58);
+  fiat_p224_addcarryx_u32(&x102, &x103, x101, x58, x86);
   uint32_t x104;
   fiat_p224_uint1 x105;
-  fiat_p224_addcarryx_u32(&x104, &x105, x103, x88, x60);
+  fiat_p224_addcarryx_u32(&x104, &x105, x103, x60, x88);
   uint32_t x106;
   fiat_p224_uint1 x107;
-  fiat_p224_addcarryx_u32(&x106, &x107, x105, x90, x62);
+  fiat_p224_addcarryx_u32(&x106, &x107, x105, x62, x90);
   uint32_t x108;
   fiat_p224_uint1 x109;
-  fiat_p224_addcarryx_u32(&x108, &x109, x107, x92, x64);
+  fiat_p224_addcarryx_u32(&x108, &x109, x107, x64, x92);
   uint32_t x110;
   fiat_p224_uint1 x111;
-  fiat_p224_addcarryx_u32(&x110, &x111, x109, x94, x66);
+  fiat_p224_addcarryx_u32(&x110, &x111, x109, x66, x94);
   uint32_t x112;
   fiat_p224_uint1 x113;
-  fiat_p224_addcarryx_u32(&x112, &x113, x111, x96, x68);
+  fiat_p224_addcarryx_u32(&x112, &x113, x111, x68, x96);
   uint32_t x114;
   fiat_p224_uint1 x115;
-  fiat_p224_addcarryx_u32(&x114, &x115, x113, x98, (fiat_p224_uint1)x70);
+  fiat_p224_addcarryx_u32(&x114, &x115, x113, (fiat_p224_uint1)x70, x98);
   uint32_t x116;
   uint32_t x117;
   fiat_p224_mulx_u32(&x116, &x117, x100, UINT32_C(0xffffffff));
@@ -302,43 +302,43 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x124, &x125, x116, UINT32_C(0xffffffff));
   uint32_t x126;
   fiat_p224_uint1 x127;
-  fiat_p224_addcarryx_u32(&x126, &x127, 0x0, x122, x125);
+  fiat_p224_addcarryx_u32(&x126, &x127, 0x0, x125, x122);
   uint32_t x128;
   fiat_p224_uint1 x129;
-  fiat_p224_addcarryx_u32(&x128, &x129, x127, x120, x123);
+  fiat_p224_addcarryx_u32(&x128, &x129, x127, x123, x120);
   uint32_t x130;
   fiat_p224_uint1 x131;
-  fiat_p224_addcarryx_u32(&x130, &x131, x129, x118, x121);
+  fiat_p224_addcarryx_u32(&x130, &x131, x129, x121, x118);
   uint32_t x132;
   fiat_p224_uint1 x133;
-  fiat_p224_addcarryx_u32(&x132, &x133, x131, 0x0, x119);
+  fiat_p224_addcarryx_u32(&x132, &x133, x131, x119, 0x0);
   uint32_t x134;
   fiat_p224_uint1 x135;
-  fiat_p224_addcarryx_u32(&x134, &x135, 0x0, x116, x100);
+  fiat_p224_addcarryx_u32(&x134, &x135, 0x0, x100, x116);
   uint32_t x136;
   fiat_p224_uint1 x137;
-  fiat_p224_addcarryx_u32(&x136, &x137, x135, 0x0, x102);
+  fiat_p224_addcarryx_u32(&x136, &x137, x135, x102, 0x0);
   uint32_t x138;
   fiat_p224_uint1 x139;
-  fiat_p224_addcarryx_u32(&x138, &x139, x137, 0x0, x104);
+  fiat_p224_addcarryx_u32(&x138, &x139, x137, x104, 0x0);
   uint32_t x140;
   fiat_p224_uint1 x141;
-  fiat_p224_addcarryx_u32(&x140, &x141, x139, x124, x106);
+  fiat_p224_addcarryx_u32(&x140, &x141, x139, x106, x124);
   uint32_t x142;
   fiat_p224_uint1 x143;
-  fiat_p224_addcarryx_u32(&x142, &x143, x141, x126, x108);
+  fiat_p224_addcarryx_u32(&x142, &x143, x141, x108, x126);
   uint32_t x144;
   fiat_p224_uint1 x145;
-  fiat_p224_addcarryx_u32(&x144, &x145, x143, x128, x110);
+  fiat_p224_addcarryx_u32(&x144, &x145, x143, x110, x128);
   uint32_t x146;
   fiat_p224_uint1 x147;
-  fiat_p224_addcarryx_u32(&x146, &x147, x145, x130, x112);
+  fiat_p224_addcarryx_u32(&x146, &x147, x145, x112, x130);
   uint32_t x148;
   fiat_p224_uint1 x149;
-  fiat_p224_addcarryx_u32(&x148, &x149, x147, x132, x114);
+  fiat_p224_addcarryx_u32(&x148, &x149, x147, x114, x132);
   uint32_t x150;
   fiat_p224_uint1 x151;
-  fiat_p224_addcarryx_u32(&x150, &x151, x149, 0x0, x115);
+  fiat_p224_addcarryx_u32(&x150, &x151, x149, x115, 0x0);
   uint32_t x152;
   uint32_t x153;
   fiat_p224_mulx_u32(&x152, &x153, x2, (arg2[6]));
@@ -362,49 +362,49 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x164, &x165, x2, (arg2[0]));
   uint32_t x166;
   fiat_p224_uint1 x167;
-  fiat_p224_addcarryx_u32(&x166, &x167, 0x0, x162, x165);
+  fiat_p224_addcarryx_u32(&x166, &x167, 0x0, x165, x162);
   uint32_t x168;
   fiat_p224_uint1 x169;
-  fiat_p224_addcarryx_u32(&x168, &x169, x167, x160, x163);
+  fiat_p224_addcarryx_u32(&x168, &x169, x167, x163, x160);
   uint32_t x170;
   fiat_p224_uint1 x171;
-  fiat_p224_addcarryx_u32(&x170, &x171, x169, x158, x161);
+  fiat_p224_addcarryx_u32(&x170, &x171, x169, x161, x158);
   uint32_t x172;
   fiat_p224_uint1 x173;
-  fiat_p224_addcarryx_u32(&x172, &x173, x171, x156, x159);
+  fiat_p224_addcarryx_u32(&x172, &x173, x171, x159, x156);
   uint32_t x174;
   fiat_p224_uint1 x175;
-  fiat_p224_addcarryx_u32(&x174, &x175, x173, x154, x157);
+  fiat_p224_addcarryx_u32(&x174, &x175, x173, x157, x154);
   uint32_t x176;
   fiat_p224_uint1 x177;
-  fiat_p224_addcarryx_u32(&x176, &x177, x175, x152, x155);
+  fiat_p224_addcarryx_u32(&x176, &x177, x175, x155, x152);
   uint32_t x178;
   fiat_p224_uint1 x179;
-  fiat_p224_addcarryx_u32(&x178, &x179, x177, 0x0, x153);
+  fiat_p224_addcarryx_u32(&x178, &x179, x177, x153, 0x0);
   uint32_t x180;
   fiat_p224_uint1 x181;
-  fiat_p224_addcarryx_u32(&x180, &x181, 0x0, x164, x136);
+  fiat_p224_addcarryx_u32(&x180, &x181, 0x0, x136, x164);
   uint32_t x182;
   fiat_p224_uint1 x183;
-  fiat_p224_addcarryx_u32(&x182, &x183, x181, x166, x138);
+  fiat_p224_addcarryx_u32(&x182, &x183, x181, x138, x166);
   uint32_t x184;
   fiat_p224_uint1 x185;
-  fiat_p224_addcarryx_u32(&x184, &x185, x183, x168, x140);
+  fiat_p224_addcarryx_u32(&x184, &x185, x183, x140, x168);
   uint32_t x186;
   fiat_p224_uint1 x187;
-  fiat_p224_addcarryx_u32(&x186, &x187, x185, x170, x142);
+  fiat_p224_addcarryx_u32(&x186, &x187, x185, x142, x170);
   uint32_t x188;
   fiat_p224_uint1 x189;
-  fiat_p224_addcarryx_u32(&x188, &x189, x187, x172, x144);
+  fiat_p224_addcarryx_u32(&x188, &x189, x187, x144, x172);
   uint32_t x190;
   fiat_p224_uint1 x191;
-  fiat_p224_addcarryx_u32(&x190, &x191, x189, x174, x146);
+  fiat_p224_addcarryx_u32(&x190, &x191, x189, x146, x174);
   uint32_t x192;
   fiat_p224_uint1 x193;
-  fiat_p224_addcarryx_u32(&x192, &x193, x191, x176, x148);
+  fiat_p224_addcarryx_u32(&x192, &x193, x191, x148, x176);
   uint32_t x194;
   fiat_p224_uint1 x195;
-  fiat_p224_addcarryx_u32(&x194, &x195, x193, x178, x150);
+  fiat_p224_addcarryx_u32(&x194, &x195, x193, x150, x178);
   uint32_t x196;
   uint32_t x197;
   fiat_p224_mulx_u32(&x196, &x197, x180, UINT32_C(0xffffffff));
@@ -422,43 +422,43 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x204, &x205, x196, UINT32_C(0xffffffff));
   uint32_t x206;
   fiat_p224_uint1 x207;
-  fiat_p224_addcarryx_u32(&x206, &x207, 0x0, x202, x205);
+  fiat_p224_addcarryx_u32(&x206, &x207, 0x0, x205, x202);
   uint32_t x208;
   fiat_p224_uint1 x209;
-  fiat_p224_addcarryx_u32(&x208, &x209, x207, x200, x203);
+  fiat_p224_addcarryx_u32(&x208, &x209, x207, x203, x200);
   uint32_t x210;
   fiat_p224_uint1 x211;
-  fiat_p224_addcarryx_u32(&x210, &x211, x209, x198, x201);
+  fiat_p224_addcarryx_u32(&x210, &x211, x209, x201, x198);
   uint32_t x212;
   fiat_p224_uint1 x213;
-  fiat_p224_addcarryx_u32(&x212, &x213, x211, 0x0, x199);
+  fiat_p224_addcarryx_u32(&x212, &x213, x211, x199, 0x0);
   uint32_t x214;
   fiat_p224_uint1 x215;
-  fiat_p224_addcarryx_u32(&x214, &x215, 0x0, x196, x180);
+  fiat_p224_addcarryx_u32(&x214, &x215, 0x0, x180, x196);
   uint32_t x216;
   fiat_p224_uint1 x217;
-  fiat_p224_addcarryx_u32(&x216, &x217, x215, 0x0, x182);
+  fiat_p224_addcarryx_u32(&x216, &x217, x215, x182, 0x0);
   uint32_t x218;
   fiat_p224_uint1 x219;
-  fiat_p224_addcarryx_u32(&x218, &x219, x217, 0x0, x184);
+  fiat_p224_addcarryx_u32(&x218, &x219, x217, x184, 0x0);
   uint32_t x220;
   fiat_p224_uint1 x221;
-  fiat_p224_addcarryx_u32(&x220, &x221, x219, x204, x186);
+  fiat_p224_addcarryx_u32(&x220, &x221, x219, x186, x204);
   uint32_t x222;
   fiat_p224_uint1 x223;
-  fiat_p224_addcarryx_u32(&x222, &x223, x221, x206, x188);
+  fiat_p224_addcarryx_u32(&x222, &x223, x221, x188, x206);
   uint32_t x224;
   fiat_p224_uint1 x225;
-  fiat_p224_addcarryx_u32(&x224, &x225, x223, x208, x190);
+  fiat_p224_addcarryx_u32(&x224, &x225, x223, x190, x208);
   uint32_t x226;
   fiat_p224_uint1 x227;
-  fiat_p224_addcarryx_u32(&x226, &x227, x225, x210, x192);
+  fiat_p224_addcarryx_u32(&x226, &x227, x225, x192, x210);
   uint32_t x228;
   fiat_p224_uint1 x229;
-  fiat_p224_addcarryx_u32(&x228, &x229, x227, x212, x194);
+  fiat_p224_addcarryx_u32(&x228, &x229, x227, x194, x212);
   uint32_t x230;
   fiat_p224_uint1 x231;
-  fiat_p224_addcarryx_u32(&x230, &x231, x229, 0x0, x195);
+  fiat_p224_addcarryx_u32(&x230, &x231, x229, x195, 0x0);
   uint32_t x232;
   uint32_t x233;
   fiat_p224_mulx_u32(&x232, &x233, x3, (arg2[6]));
@@ -482,49 +482,49 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x244, &x245, x3, (arg2[0]));
   uint32_t x246;
   fiat_p224_uint1 x247;
-  fiat_p224_addcarryx_u32(&x246, &x247, 0x0, x242, x245);
+  fiat_p224_addcarryx_u32(&x246, &x247, 0x0, x245, x242);
   uint32_t x248;
   fiat_p224_uint1 x249;
-  fiat_p224_addcarryx_u32(&x248, &x249, x247, x240, x243);
+  fiat_p224_addcarryx_u32(&x248, &x249, x247, x243, x240);
   uint32_t x250;
   fiat_p224_uint1 x251;
-  fiat_p224_addcarryx_u32(&x250, &x251, x249, x238, x241);
+  fiat_p224_addcarryx_u32(&x250, &x251, x249, x241, x238);
   uint32_t x252;
   fiat_p224_uint1 x253;
-  fiat_p224_addcarryx_u32(&x252, &x253, x251, x236, x239);
+  fiat_p224_addcarryx_u32(&x252, &x253, x251, x239, x236);
   uint32_t x254;
   fiat_p224_uint1 x255;
-  fiat_p224_addcarryx_u32(&x254, &x255, x253, x234, x237);
+  fiat_p224_addcarryx_u32(&x254, &x255, x253, x237, x234);
   uint32_t x256;
   fiat_p224_uint1 x257;
-  fiat_p224_addcarryx_u32(&x256, &x257, x255, x232, x235);
+  fiat_p224_addcarryx_u32(&x256, &x257, x255, x235, x232);
   uint32_t x258;
   fiat_p224_uint1 x259;
-  fiat_p224_addcarryx_u32(&x258, &x259, x257, 0x0, x233);
+  fiat_p224_addcarryx_u32(&x258, &x259, x257, x233, 0x0);
   uint32_t x260;
   fiat_p224_uint1 x261;
-  fiat_p224_addcarryx_u32(&x260, &x261, 0x0, x244, x216);
+  fiat_p224_addcarryx_u32(&x260, &x261, 0x0, x216, x244);
   uint32_t x262;
   fiat_p224_uint1 x263;
-  fiat_p224_addcarryx_u32(&x262, &x263, x261, x246, x218);
+  fiat_p224_addcarryx_u32(&x262, &x263, x261, x218, x246);
   uint32_t x264;
   fiat_p224_uint1 x265;
-  fiat_p224_addcarryx_u32(&x264, &x265, x263, x248, x220);
+  fiat_p224_addcarryx_u32(&x264, &x265, x263, x220, x248);
   uint32_t x266;
   fiat_p224_uint1 x267;
-  fiat_p224_addcarryx_u32(&x266, &x267, x265, x250, x222);
+  fiat_p224_addcarryx_u32(&x266, &x267, x265, x222, x250);
   uint32_t x268;
   fiat_p224_uint1 x269;
-  fiat_p224_addcarryx_u32(&x268, &x269, x267, x252, x224);
+  fiat_p224_addcarryx_u32(&x268, &x269, x267, x224, x252);
   uint32_t x270;
   fiat_p224_uint1 x271;
-  fiat_p224_addcarryx_u32(&x270, &x271, x269, x254, x226);
+  fiat_p224_addcarryx_u32(&x270, &x271, x269, x226, x254);
   uint32_t x272;
   fiat_p224_uint1 x273;
-  fiat_p224_addcarryx_u32(&x272, &x273, x271, x256, x228);
+  fiat_p224_addcarryx_u32(&x272, &x273, x271, x228, x256);
   uint32_t x274;
   fiat_p224_uint1 x275;
-  fiat_p224_addcarryx_u32(&x274, &x275, x273, x258, x230);
+  fiat_p224_addcarryx_u32(&x274, &x275, x273, x230, x258);
   uint32_t x276;
   uint32_t x277;
   fiat_p224_mulx_u32(&x276, &x277, x260, UINT32_C(0xffffffff));
@@ -542,43 +542,43 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x284, &x285, x276, UINT32_C(0xffffffff));
   uint32_t x286;
   fiat_p224_uint1 x287;
-  fiat_p224_addcarryx_u32(&x286, &x287, 0x0, x282, x285);
+  fiat_p224_addcarryx_u32(&x286, &x287, 0x0, x285, x282);
   uint32_t x288;
   fiat_p224_uint1 x289;
-  fiat_p224_addcarryx_u32(&x288, &x289, x287, x280, x283);
+  fiat_p224_addcarryx_u32(&x288, &x289, x287, x283, x280);
   uint32_t x290;
   fiat_p224_uint1 x291;
-  fiat_p224_addcarryx_u32(&x290, &x291, x289, x278, x281);
+  fiat_p224_addcarryx_u32(&x290, &x291, x289, x281, x278);
   uint32_t x292;
   fiat_p224_uint1 x293;
-  fiat_p224_addcarryx_u32(&x292, &x293, x291, 0x0, x279);
+  fiat_p224_addcarryx_u32(&x292, &x293, x291, x279, 0x0);
   uint32_t x294;
   fiat_p224_uint1 x295;
-  fiat_p224_addcarryx_u32(&x294, &x295, 0x0, x276, x260);
+  fiat_p224_addcarryx_u32(&x294, &x295, 0x0, x260, x276);
   uint32_t x296;
   fiat_p224_uint1 x297;
-  fiat_p224_addcarryx_u32(&x296, &x297, x295, 0x0, x262);
+  fiat_p224_addcarryx_u32(&x296, &x297, x295, x262, 0x0);
   uint32_t x298;
   fiat_p224_uint1 x299;
-  fiat_p224_addcarryx_u32(&x298, &x299, x297, 0x0, x264);
+  fiat_p224_addcarryx_u32(&x298, &x299, x297, x264, 0x0);
   uint32_t x300;
   fiat_p224_uint1 x301;
-  fiat_p224_addcarryx_u32(&x300, &x301, x299, x284, x266);
+  fiat_p224_addcarryx_u32(&x300, &x301, x299, x266, x284);
   uint32_t x302;
   fiat_p224_uint1 x303;
-  fiat_p224_addcarryx_u32(&x302, &x303, x301, x286, x268);
+  fiat_p224_addcarryx_u32(&x302, &x303, x301, x268, x286);
   uint32_t x304;
   fiat_p224_uint1 x305;
-  fiat_p224_addcarryx_u32(&x304, &x305, x303, x288, x270);
+  fiat_p224_addcarryx_u32(&x304, &x305, x303, x270, x288);
   uint32_t x306;
   fiat_p224_uint1 x307;
-  fiat_p224_addcarryx_u32(&x306, &x307, x305, x290, x272);
+  fiat_p224_addcarryx_u32(&x306, &x307, x305, x272, x290);
   uint32_t x308;
   fiat_p224_uint1 x309;
-  fiat_p224_addcarryx_u32(&x308, &x309, x307, x292, x274);
+  fiat_p224_addcarryx_u32(&x308, &x309, x307, x274, x292);
   uint32_t x310;
   fiat_p224_uint1 x311;
-  fiat_p224_addcarryx_u32(&x310, &x311, x309, 0x0, x275);
+  fiat_p224_addcarryx_u32(&x310, &x311, x309, x275, 0x0);
   uint32_t x312;
   uint32_t x313;
   fiat_p224_mulx_u32(&x312, &x313, x4, (arg2[6]));
@@ -602,49 +602,49 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x324, &x325, x4, (arg2[0]));
   uint32_t x326;
   fiat_p224_uint1 x327;
-  fiat_p224_addcarryx_u32(&x326, &x327, 0x0, x322, x325);
+  fiat_p224_addcarryx_u32(&x326, &x327, 0x0, x325, x322);
   uint32_t x328;
   fiat_p224_uint1 x329;
-  fiat_p224_addcarryx_u32(&x328, &x329, x327, x320, x323);
+  fiat_p224_addcarryx_u32(&x328, &x329, x327, x323, x320);
   uint32_t x330;
   fiat_p224_uint1 x331;
-  fiat_p224_addcarryx_u32(&x330, &x331, x329, x318, x321);
+  fiat_p224_addcarryx_u32(&x330, &x331, x329, x321, x318);
   uint32_t x332;
   fiat_p224_uint1 x333;
-  fiat_p224_addcarryx_u32(&x332, &x333, x331, x316, x319);
+  fiat_p224_addcarryx_u32(&x332, &x333, x331, x319, x316);
   uint32_t x334;
   fiat_p224_uint1 x335;
-  fiat_p224_addcarryx_u32(&x334, &x335, x333, x314, x317);
+  fiat_p224_addcarryx_u32(&x334, &x335, x333, x317, x314);
   uint32_t x336;
   fiat_p224_uint1 x337;
-  fiat_p224_addcarryx_u32(&x336, &x337, x335, x312, x315);
+  fiat_p224_addcarryx_u32(&x336, &x337, x335, x315, x312);
   uint32_t x338;
   fiat_p224_uint1 x339;
-  fiat_p224_addcarryx_u32(&x338, &x339, x337, 0x0, x313);
+  fiat_p224_addcarryx_u32(&x338, &x339, x337, x313, 0x0);
   uint32_t x340;
   fiat_p224_uint1 x341;
-  fiat_p224_addcarryx_u32(&x340, &x341, 0x0, x324, x296);
+  fiat_p224_addcarryx_u32(&x340, &x341, 0x0, x296, x324);
   uint32_t x342;
   fiat_p224_uint1 x343;
-  fiat_p224_addcarryx_u32(&x342, &x343, x341, x326, x298);
+  fiat_p224_addcarryx_u32(&x342, &x343, x341, x298, x326);
   uint32_t x344;
   fiat_p224_uint1 x345;
-  fiat_p224_addcarryx_u32(&x344, &x345, x343, x328, x300);
+  fiat_p224_addcarryx_u32(&x344, &x345, x343, x300, x328);
   uint32_t x346;
   fiat_p224_uint1 x347;
-  fiat_p224_addcarryx_u32(&x346, &x347, x345, x330, x302);
+  fiat_p224_addcarryx_u32(&x346, &x347, x345, x302, x330);
   uint32_t x348;
   fiat_p224_uint1 x349;
-  fiat_p224_addcarryx_u32(&x348, &x349, x347, x332, x304);
+  fiat_p224_addcarryx_u32(&x348, &x349, x347, x304, x332);
   uint32_t x350;
   fiat_p224_uint1 x351;
-  fiat_p224_addcarryx_u32(&x350, &x351, x349, x334, x306);
+  fiat_p224_addcarryx_u32(&x350, &x351, x349, x306, x334);
   uint32_t x352;
   fiat_p224_uint1 x353;
-  fiat_p224_addcarryx_u32(&x352, &x353, x351, x336, x308);
+  fiat_p224_addcarryx_u32(&x352, &x353, x351, x308, x336);
   uint32_t x354;
   fiat_p224_uint1 x355;
-  fiat_p224_addcarryx_u32(&x354, &x355, x353, x338, x310);
+  fiat_p224_addcarryx_u32(&x354, &x355, x353, x310, x338);
   uint32_t x356;
   uint32_t x357;
   fiat_p224_mulx_u32(&x356, &x357, x340, UINT32_C(0xffffffff));
@@ -662,43 +662,43 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x364, &x365, x356, UINT32_C(0xffffffff));
   uint32_t x366;
   fiat_p224_uint1 x367;
-  fiat_p224_addcarryx_u32(&x366, &x367, 0x0, x362, x365);
+  fiat_p224_addcarryx_u32(&x366, &x367, 0x0, x365, x362);
   uint32_t x368;
   fiat_p224_uint1 x369;
-  fiat_p224_addcarryx_u32(&x368, &x369, x367, x360, x363);
+  fiat_p224_addcarryx_u32(&x368, &x369, x367, x363, x360);
   uint32_t x370;
   fiat_p224_uint1 x371;
-  fiat_p224_addcarryx_u32(&x370, &x371, x369, x358, x361);
+  fiat_p224_addcarryx_u32(&x370, &x371, x369, x361, x358);
   uint32_t x372;
   fiat_p224_uint1 x373;
-  fiat_p224_addcarryx_u32(&x372, &x373, x371, 0x0, x359);
+  fiat_p224_addcarryx_u32(&x372, &x373, x371, x359, 0x0);
   uint32_t x374;
   fiat_p224_uint1 x375;
-  fiat_p224_addcarryx_u32(&x374, &x375, 0x0, x356, x340);
+  fiat_p224_addcarryx_u32(&x374, &x375, 0x0, x340, x356);
   uint32_t x376;
   fiat_p224_uint1 x377;
-  fiat_p224_addcarryx_u32(&x376, &x377, x375, 0x0, x342);
+  fiat_p224_addcarryx_u32(&x376, &x377, x375, x342, 0x0);
   uint32_t x378;
   fiat_p224_uint1 x379;
-  fiat_p224_addcarryx_u32(&x378, &x379, x377, 0x0, x344);
+  fiat_p224_addcarryx_u32(&x378, &x379, x377, x344, 0x0);
   uint32_t x380;
   fiat_p224_uint1 x381;
-  fiat_p224_addcarryx_u32(&x380, &x381, x379, x364, x346);
+  fiat_p224_addcarryx_u32(&x380, &x381, x379, x346, x364);
   uint32_t x382;
   fiat_p224_uint1 x383;
-  fiat_p224_addcarryx_u32(&x382, &x383, x381, x366, x348);
+  fiat_p224_addcarryx_u32(&x382, &x383, x381, x348, x366);
   uint32_t x384;
   fiat_p224_uint1 x385;
-  fiat_p224_addcarryx_u32(&x384, &x385, x383, x368, x350);
+  fiat_p224_addcarryx_u32(&x384, &x385, x383, x350, x368);
   uint32_t x386;
   fiat_p224_uint1 x387;
-  fiat_p224_addcarryx_u32(&x386, &x387, x385, x370, x352);
+  fiat_p224_addcarryx_u32(&x386, &x387, x385, x352, x370);
   uint32_t x388;
   fiat_p224_uint1 x389;
-  fiat_p224_addcarryx_u32(&x388, &x389, x387, x372, x354);
+  fiat_p224_addcarryx_u32(&x388, &x389, x387, x354, x372);
   uint32_t x390;
   fiat_p224_uint1 x391;
-  fiat_p224_addcarryx_u32(&x390, &x391, x389, 0x0, x355);
+  fiat_p224_addcarryx_u32(&x390, &x391, x389, x355, 0x0);
   uint32_t x392;
   uint32_t x393;
   fiat_p224_mulx_u32(&x392, &x393, x5, (arg2[6]));
@@ -722,49 +722,49 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x404, &x405, x5, (arg2[0]));
   uint32_t x406;
   fiat_p224_uint1 x407;
-  fiat_p224_addcarryx_u32(&x406, &x407, 0x0, x402, x405);
+  fiat_p224_addcarryx_u32(&x406, &x407, 0x0, x405, x402);
   uint32_t x408;
   fiat_p224_uint1 x409;
-  fiat_p224_addcarryx_u32(&x408, &x409, x407, x400, x403);
+  fiat_p224_addcarryx_u32(&x408, &x409, x407, x403, x400);
   uint32_t x410;
   fiat_p224_uint1 x411;
-  fiat_p224_addcarryx_u32(&x410, &x411, x409, x398, x401);
+  fiat_p224_addcarryx_u32(&x410, &x411, x409, x401, x398);
   uint32_t x412;
   fiat_p224_uint1 x413;
-  fiat_p224_addcarryx_u32(&x412, &x413, x411, x396, x399);
+  fiat_p224_addcarryx_u32(&x412, &x413, x411, x399, x396);
   uint32_t x414;
   fiat_p224_uint1 x415;
-  fiat_p224_addcarryx_u32(&x414, &x415, x413, x394, x397);
+  fiat_p224_addcarryx_u32(&x414, &x415, x413, x397, x394);
   uint32_t x416;
   fiat_p224_uint1 x417;
-  fiat_p224_addcarryx_u32(&x416, &x417, x415, x392, x395);
+  fiat_p224_addcarryx_u32(&x416, &x417, x415, x395, x392);
   uint32_t x418;
   fiat_p224_uint1 x419;
-  fiat_p224_addcarryx_u32(&x418, &x419, x417, 0x0, x393);
+  fiat_p224_addcarryx_u32(&x418, &x419, x417, x393, 0x0);
   uint32_t x420;
   fiat_p224_uint1 x421;
-  fiat_p224_addcarryx_u32(&x420, &x421, 0x0, x404, x376);
+  fiat_p224_addcarryx_u32(&x420, &x421, 0x0, x376, x404);
   uint32_t x422;
   fiat_p224_uint1 x423;
-  fiat_p224_addcarryx_u32(&x422, &x423, x421, x406, x378);
+  fiat_p224_addcarryx_u32(&x422, &x423, x421, x378, x406);
   uint32_t x424;
   fiat_p224_uint1 x425;
-  fiat_p224_addcarryx_u32(&x424, &x425, x423, x408, x380);
+  fiat_p224_addcarryx_u32(&x424, &x425, x423, x380, x408);
   uint32_t x426;
   fiat_p224_uint1 x427;
-  fiat_p224_addcarryx_u32(&x426, &x427, x425, x410, x382);
+  fiat_p224_addcarryx_u32(&x426, &x427, x425, x382, x410);
   uint32_t x428;
   fiat_p224_uint1 x429;
-  fiat_p224_addcarryx_u32(&x428, &x429, x427, x412, x384);
+  fiat_p224_addcarryx_u32(&x428, &x429, x427, x384, x412);
   uint32_t x430;
   fiat_p224_uint1 x431;
-  fiat_p224_addcarryx_u32(&x430, &x431, x429, x414, x386);
+  fiat_p224_addcarryx_u32(&x430, &x431, x429, x386, x414);
   uint32_t x432;
   fiat_p224_uint1 x433;
-  fiat_p224_addcarryx_u32(&x432, &x433, x431, x416, x388);
+  fiat_p224_addcarryx_u32(&x432, &x433, x431, x388, x416);
   uint32_t x434;
   fiat_p224_uint1 x435;
-  fiat_p224_addcarryx_u32(&x434, &x435, x433, x418, x390);
+  fiat_p224_addcarryx_u32(&x434, &x435, x433, x390, x418);
   uint32_t x436;
   uint32_t x437;
   fiat_p224_mulx_u32(&x436, &x437, x420, UINT32_C(0xffffffff));
@@ -782,43 +782,43 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x444, &x445, x436, UINT32_C(0xffffffff));
   uint32_t x446;
   fiat_p224_uint1 x447;
-  fiat_p224_addcarryx_u32(&x446, &x447, 0x0, x442, x445);
+  fiat_p224_addcarryx_u32(&x446, &x447, 0x0, x445, x442);
   uint32_t x448;
   fiat_p224_uint1 x449;
-  fiat_p224_addcarryx_u32(&x448, &x449, x447, x440, x443);
+  fiat_p224_addcarryx_u32(&x448, &x449, x447, x443, x440);
   uint32_t x450;
   fiat_p224_uint1 x451;
-  fiat_p224_addcarryx_u32(&x450, &x451, x449, x438, x441);
+  fiat_p224_addcarryx_u32(&x450, &x451, x449, x441, x438);
   uint32_t x452;
   fiat_p224_uint1 x453;
-  fiat_p224_addcarryx_u32(&x452, &x453, x451, 0x0, x439);
+  fiat_p224_addcarryx_u32(&x452, &x453, x451, x439, 0x0);
   uint32_t x454;
   fiat_p224_uint1 x455;
-  fiat_p224_addcarryx_u32(&x454, &x455, 0x0, x436, x420);
+  fiat_p224_addcarryx_u32(&x454, &x455, 0x0, x420, x436);
   uint32_t x456;
   fiat_p224_uint1 x457;
-  fiat_p224_addcarryx_u32(&x456, &x457, x455, 0x0, x422);
+  fiat_p224_addcarryx_u32(&x456, &x457, x455, x422, 0x0);
   uint32_t x458;
   fiat_p224_uint1 x459;
-  fiat_p224_addcarryx_u32(&x458, &x459, x457, 0x0, x424);
+  fiat_p224_addcarryx_u32(&x458, &x459, x457, x424, 0x0);
   uint32_t x460;
   fiat_p224_uint1 x461;
-  fiat_p224_addcarryx_u32(&x460, &x461, x459, x444, x426);
+  fiat_p224_addcarryx_u32(&x460, &x461, x459, x426, x444);
   uint32_t x462;
   fiat_p224_uint1 x463;
-  fiat_p224_addcarryx_u32(&x462, &x463, x461, x446, x428);
+  fiat_p224_addcarryx_u32(&x462, &x463, x461, x428, x446);
   uint32_t x464;
   fiat_p224_uint1 x465;
-  fiat_p224_addcarryx_u32(&x464, &x465, x463, x448, x430);
+  fiat_p224_addcarryx_u32(&x464, &x465, x463, x430, x448);
   uint32_t x466;
   fiat_p224_uint1 x467;
-  fiat_p224_addcarryx_u32(&x466, &x467, x465, x450, x432);
+  fiat_p224_addcarryx_u32(&x466, &x467, x465, x432, x450);
   uint32_t x468;
   fiat_p224_uint1 x469;
-  fiat_p224_addcarryx_u32(&x468, &x469, x467, x452, x434);
+  fiat_p224_addcarryx_u32(&x468, &x469, x467, x434, x452);
   uint32_t x470;
   fiat_p224_uint1 x471;
-  fiat_p224_addcarryx_u32(&x470, &x471, x469, 0x0, x435);
+  fiat_p224_addcarryx_u32(&x470, &x471, x469, x435, 0x0);
   uint32_t x472;
   uint32_t x473;
   fiat_p224_mulx_u32(&x472, &x473, x6, (arg2[6]));
@@ -842,49 +842,49 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x484, &x485, x6, (arg2[0]));
   uint32_t x486;
   fiat_p224_uint1 x487;
-  fiat_p224_addcarryx_u32(&x486, &x487, 0x0, x482, x485);
+  fiat_p224_addcarryx_u32(&x486, &x487, 0x0, x485, x482);
   uint32_t x488;
   fiat_p224_uint1 x489;
-  fiat_p224_addcarryx_u32(&x488, &x489, x487, x480, x483);
+  fiat_p224_addcarryx_u32(&x488, &x489, x487, x483, x480);
   uint32_t x490;
   fiat_p224_uint1 x491;
-  fiat_p224_addcarryx_u32(&x490, &x491, x489, x478, x481);
+  fiat_p224_addcarryx_u32(&x490, &x491, x489, x481, x478);
   uint32_t x492;
   fiat_p224_uint1 x493;
-  fiat_p224_addcarryx_u32(&x492, &x493, x491, x476, x479);
+  fiat_p224_addcarryx_u32(&x492, &x493, x491, x479, x476);
   uint32_t x494;
   fiat_p224_uint1 x495;
-  fiat_p224_addcarryx_u32(&x494, &x495, x493, x474, x477);
+  fiat_p224_addcarryx_u32(&x494, &x495, x493, x477, x474);
   uint32_t x496;
   fiat_p224_uint1 x497;
-  fiat_p224_addcarryx_u32(&x496, &x497, x495, x472, x475);
+  fiat_p224_addcarryx_u32(&x496, &x497, x495, x475, x472);
   uint32_t x498;
   fiat_p224_uint1 x499;
-  fiat_p224_addcarryx_u32(&x498, &x499, x497, 0x0, x473);
+  fiat_p224_addcarryx_u32(&x498, &x499, x497, x473, 0x0);
   uint32_t x500;
   fiat_p224_uint1 x501;
-  fiat_p224_addcarryx_u32(&x500, &x501, 0x0, x484, x456);
+  fiat_p224_addcarryx_u32(&x500, &x501, 0x0, x456, x484);
   uint32_t x502;
   fiat_p224_uint1 x503;
-  fiat_p224_addcarryx_u32(&x502, &x503, x501, x486, x458);
+  fiat_p224_addcarryx_u32(&x502, &x503, x501, x458, x486);
   uint32_t x504;
   fiat_p224_uint1 x505;
-  fiat_p224_addcarryx_u32(&x504, &x505, x503, x488, x460);
+  fiat_p224_addcarryx_u32(&x504, &x505, x503, x460, x488);
   uint32_t x506;
   fiat_p224_uint1 x507;
-  fiat_p224_addcarryx_u32(&x506, &x507, x505, x490, x462);
+  fiat_p224_addcarryx_u32(&x506, &x507, x505, x462, x490);
   uint32_t x508;
   fiat_p224_uint1 x509;
-  fiat_p224_addcarryx_u32(&x508, &x509, x507, x492, x464);
+  fiat_p224_addcarryx_u32(&x508, &x509, x507, x464, x492);
   uint32_t x510;
   fiat_p224_uint1 x511;
-  fiat_p224_addcarryx_u32(&x510, &x511, x509, x494, x466);
+  fiat_p224_addcarryx_u32(&x510, &x511, x509, x466, x494);
   uint32_t x512;
   fiat_p224_uint1 x513;
-  fiat_p224_addcarryx_u32(&x512, &x513, x511, x496, x468);
+  fiat_p224_addcarryx_u32(&x512, &x513, x511, x468, x496);
   uint32_t x514;
   fiat_p224_uint1 x515;
-  fiat_p224_addcarryx_u32(&x514, &x515, x513, x498, x470);
+  fiat_p224_addcarryx_u32(&x514, &x515, x513, x470, x498);
   uint32_t x516;
   uint32_t x517;
   fiat_p224_mulx_u32(&x516, &x517, x500, UINT32_C(0xffffffff));
@@ -902,43 +902,43 @@ static void fiat_p224_mul(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_mulx_u32(&x524, &x525, x516, UINT32_C(0xffffffff));
   uint32_t x526;
   fiat_p224_uint1 x527;
-  fiat_p224_addcarryx_u32(&x526, &x527, 0x0, x522, x525);
+  fiat_p224_addcarryx_u32(&x526, &x527, 0x0, x525, x522);
   uint32_t x528;
   fiat_p224_uint1 x529;
-  fiat_p224_addcarryx_u32(&x528, &x529, x527, x520, x523);
+  fiat_p224_addcarryx_u32(&x528, &x529, x527, x523, x520);
   uint32_t x530;
   fiat_p224_uint1 x531;
-  fiat_p224_addcarryx_u32(&x530, &x531, x529, x518, x521);
+  fiat_p224_addcarryx_u32(&x530, &x531, x529, x521, x518);
   uint32_t x532;
   fiat_p224_uint1 x533;
-  fiat_p224_addcarryx_u32(&x532, &x533, x531, 0x0, x519);
+  fiat_p224_addcarryx_u32(&x532, &x533, x531, x519, 0x0);
   uint32_t x534;
   fiat_p224_uint1 x535;
-  fiat_p224_addcarryx_u32(&x534, &x535, 0x0, x516, x500);
+  fiat_p224_addcarryx_u32(&x534, &x535, 0x0, x500, x516);
   uint32_t x536;
   fiat_p224_uint1 x537;
-  fiat_p224_addcarryx_u32(&x536, &x537, x535, 0x0, x502);
+  fiat_p224_addcarryx_u32(&x536, &x537, x535, x502, 0x0);
   uint32_t x538;
   fiat_p224_uint1 x539;
-  fiat_p224_addcarryx_u32(&x538, &x539, x537, 0x0, x504);
+  fiat_p224_addcarryx_u32(&x538, &x539, x537, x504, 0x0);
   uint32_t x540;
   fiat_p224_uint1 x541;
-  fiat_p224_addcarryx_u32(&x540, &x541, x539, x524, x506);
+  fiat_p224_addcarryx_u32(&x540, &x541, x539, x506, x524);
   uint32_t x542;
   fiat_p224_uint1 x543;
-  fiat_p224_addcarryx_u32(&x542, &x543, x541, x526, x508);
+  fiat_p224_addcarryx_u32(&x542, &x543, x541, x508, x526);
   uint32_t x544;
   fiat_p224_uint1 x545;
-  fiat_p224_addcarryx_u32(&x544, &x545, x543, x528, x510);
+  fiat_p224_addcarryx_u32(&x544, &x545, x543, x510, x528);
   uint32_t x546;
   fiat_p224_uint1 x547;
-  fiat_p224_addcarryx_u32(&x546, &x547, x545, x530, x512);
+  fiat_p224_addcarryx_u32(&x546, &x547, x545, x512, x530);
   uint32_t x548;
   fiat_p224_uint1 x549;
-  fiat_p224_addcarryx_u32(&x548, &x549, x547, x532, x514);
+  fiat_p224_addcarryx_u32(&x548, &x549, x547, x514, x532);
   uint32_t x550;
   fiat_p224_uint1 x551;
-  fiat_p224_addcarryx_u32(&x550, &x551, x549, 0x0, x515);
+  fiat_p224_addcarryx_u32(&x550, &x551, x549, x515, 0x0);
   uint32_t x552;
   fiat_p224_uint1 x553;
   fiat_p224_subborrowx_u32(&x552, &x553, 0x0, x536, 0x1);
@@ -1030,25 +1030,25 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x20, &x21, x7, (arg1[0]));
   uint32_t x22;
   fiat_p224_uint1 x23;
-  fiat_p224_addcarryx_u32(&x22, &x23, 0x0, x18, x21);
+  fiat_p224_addcarryx_u32(&x22, &x23, 0x0, x21, x18);
   uint32_t x24;
   fiat_p224_uint1 x25;
-  fiat_p224_addcarryx_u32(&x24, &x25, x23, x16, x19);
+  fiat_p224_addcarryx_u32(&x24, &x25, x23, x19, x16);
   uint32_t x26;
   fiat_p224_uint1 x27;
-  fiat_p224_addcarryx_u32(&x26, &x27, x25, x14, x17);
+  fiat_p224_addcarryx_u32(&x26, &x27, x25, x17, x14);
   uint32_t x28;
   fiat_p224_uint1 x29;
-  fiat_p224_addcarryx_u32(&x28, &x29, x27, x12, x15);
+  fiat_p224_addcarryx_u32(&x28, &x29, x27, x15, x12);
   uint32_t x30;
   fiat_p224_uint1 x31;
-  fiat_p224_addcarryx_u32(&x30, &x31, x29, x10, x13);
+  fiat_p224_addcarryx_u32(&x30, &x31, x29, x13, x10);
   uint32_t x32;
   fiat_p224_uint1 x33;
-  fiat_p224_addcarryx_u32(&x32, &x33, x31, x8, x11);
+  fiat_p224_addcarryx_u32(&x32, &x33, x31, x11, x8);
   uint32_t x34;
   fiat_p224_uint1 x35;
-  fiat_p224_addcarryx_u32(&x34, &x35, x33, 0x0, x9);
+  fiat_p224_addcarryx_u32(&x34, &x35, x33, x9, 0x0);
   uint32_t x36;
   uint32_t x37;
   fiat_p224_mulx_u32(&x36, &x37, x20, UINT32_C(0xffffffff));
@@ -1066,40 +1066,40 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x44, &x45, x36, UINT32_C(0xffffffff));
   uint32_t x46;
   fiat_p224_uint1 x47;
-  fiat_p224_addcarryx_u32(&x46, &x47, 0x0, x42, x45);
+  fiat_p224_addcarryx_u32(&x46, &x47, 0x0, x45, x42);
   uint32_t x48;
   fiat_p224_uint1 x49;
-  fiat_p224_addcarryx_u32(&x48, &x49, x47, x40, x43);
+  fiat_p224_addcarryx_u32(&x48, &x49, x47, x43, x40);
   uint32_t x50;
   fiat_p224_uint1 x51;
-  fiat_p224_addcarryx_u32(&x50, &x51, x49, x38, x41);
+  fiat_p224_addcarryx_u32(&x50, &x51, x49, x41, x38);
   uint32_t x52;
   fiat_p224_uint1 x53;
-  fiat_p224_addcarryx_u32(&x52, &x53, x51, 0x0, x39);
+  fiat_p224_addcarryx_u32(&x52, &x53, x51, x39, 0x0);
   uint32_t x54;
   fiat_p224_uint1 x55;
-  fiat_p224_addcarryx_u32(&x54, &x55, 0x0, x36, x20);
+  fiat_p224_addcarryx_u32(&x54, &x55, 0x0, x20, x36);
   uint32_t x56;
   fiat_p224_uint1 x57;
-  fiat_p224_addcarryx_u32(&x56, &x57, x55, 0x0, x22);
+  fiat_p224_addcarryx_u32(&x56, &x57, x55, x22, 0x0);
   uint32_t x58;
   fiat_p224_uint1 x59;
-  fiat_p224_addcarryx_u32(&x58, &x59, x57, 0x0, x24);
+  fiat_p224_addcarryx_u32(&x58, &x59, x57, x24, 0x0);
   uint32_t x60;
   fiat_p224_uint1 x61;
-  fiat_p224_addcarryx_u32(&x60, &x61, x59, x44, x26);
+  fiat_p224_addcarryx_u32(&x60, &x61, x59, x26, x44);
   uint32_t x62;
   fiat_p224_uint1 x63;
-  fiat_p224_addcarryx_u32(&x62, &x63, x61, x46, x28);
+  fiat_p224_addcarryx_u32(&x62, &x63, x61, x28, x46);
   uint32_t x64;
   fiat_p224_uint1 x65;
-  fiat_p224_addcarryx_u32(&x64, &x65, x63, x48, x30);
+  fiat_p224_addcarryx_u32(&x64, &x65, x63, x30, x48);
   uint32_t x66;
   fiat_p224_uint1 x67;
-  fiat_p224_addcarryx_u32(&x66, &x67, x65, x50, x32);
+  fiat_p224_addcarryx_u32(&x66, &x67, x65, x32, x50);
   uint32_t x68;
   fiat_p224_uint1 x69;
-  fiat_p224_addcarryx_u32(&x68, &x69, x67, x52, x34);
+  fiat_p224_addcarryx_u32(&x68, &x69, x67, x34, x52);
   uint32_t x70;
   fiat_p224_uint1 x71;
   fiat_p224_addcarryx_u32(&x70, &x71, x69, 0x0, 0x0);
@@ -1126,49 +1126,49 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x84, &x85, x1, (arg1[0]));
   uint32_t x86;
   fiat_p224_uint1 x87;
-  fiat_p224_addcarryx_u32(&x86, &x87, 0x0, x82, x85);
+  fiat_p224_addcarryx_u32(&x86, &x87, 0x0, x85, x82);
   uint32_t x88;
   fiat_p224_uint1 x89;
-  fiat_p224_addcarryx_u32(&x88, &x89, x87, x80, x83);
+  fiat_p224_addcarryx_u32(&x88, &x89, x87, x83, x80);
   uint32_t x90;
   fiat_p224_uint1 x91;
-  fiat_p224_addcarryx_u32(&x90, &x91, x89, x78, x81);
+  fiat_p224_addcarryx_u32(&x90, &x91, x89, x81, x78);
   uint32_t x92;
   fiat_p224_uint1 x93;
-  fiat_p224_addcarryx_u32(&x92, &x93, x91, x76, x79);
+  fiat_p224_addcarryx_u32(&x92, &x93, x91, x79, x76);
   uint32_t x94;
   fiat_p224_uint1 x95;
-  fiat_p224_addcarryx_u32(&x94, &x95, x93, x74, x77);
+  fiat_p224_addcarryx_u32(&x94, &x95, x93, x77, x74);
   uint32_t x96;
   fiat_p224_uint1 x97;
-  fiat_p224_addcarryx_u32(&x96, &x97, x95, x72, x75);
+  fiat_p224_addcarryx_u32(&x96, &x97, x95, x75, x72);
   uint32_t x98;
   fiat_p224_uint1 x99;
-  fiat_p224_addcarryx_u32(&x98, &x99, x97, 0x0, x73);
+  fiat_p224_addcarryx_u32(&x98, &x99, x97, x73, 0x0);
   uint32_t x100;
   fiat_p224_uint1 x101;
-  fiat_p224_addcarryx_u32(&x100, &x101, 0x0, x84, x56);
+  fiat_p224_addcarryx_u32(&x100, &x101, 0x0, x56, x84);
   uint32_t x102;
   fiat_p224_uint1 x103;
-  fiat_p224_addcarryx_u32(&x102, &x103, x101, x86, x58);
+  fiat_p224_addcarryx_u32(&x102, &x103, x101, x58, x86);
   uint32_t x104;
   fiat_p224_uint1 x105;
-  fiat_p224_addcarryx_u32(&x104, &x105, x103, x88, x60);
+  fiat_p224_addcarryx_u32(&x104, &x105, x103, x60, x88);
   uint32_t x106;
   fiat_p224_uint1 x107;
-  fiat_p224_addcarryx_u32(&x106, &x107, x105, x90, x62);
+  fiat_p224_addcarryx_u32(&x106, &x107, x105, x62, x90);
   uint32_t x108;
   fiat_p224_uint1 x109;
-  fiat_p224_addcarryx_u32(&x108, &x109, x107, x92, x64);
+  fiat_p224_addcarryx_u32(&x108, &x109, x107, x64, x92);
   uint32_t x110;
   fiat_p224_uint1 x111;
-  fiat_p224_addcarryx_u32(&x110, &x111, x109, x94, x66);
+  fiat_p224_addcarryx_u32(&x110, &x111, x109, x66, x94);
   uint32_t x112;
   fiat_p224_uint1 x113;
-  fiat_p224_addcarryx_u32(&x112, &x113, x111, x96, x68);
+  fiat_p224_addcarryx_u32(&x112, &x113, x111, x68, x96);
   uint32_t x114;
   fiat_p224_uint1 x115;
-  fiat_p224_addcarryx_u32(&x114, &x115, x113, x98, (fiat_p224_uint1)x70);
+  fiat_p224_addcarryx_u32(&x114, &x115, x113, (fiat_p224_uint1)x70, x98);
   uint32_t x116;
   uint32_t x117;
   fiat_p224_mulx_u32(&x116, &x117, x100, UINT32_C(0xffffffff));
@@ -1186,43 +1186,43 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x124, &x125, x116, UINT32_C(0xffffffff));
   uint32_t x126;
   fiat_p224_uint1 x127;
-  fiat_p224_addcarryx_u32(&x126, &x127, 0x0, x122, x125);
+  fiat_p224_addcarryx_u32(&x126, &x127, 0x0, x125, x122);
   uint32_t x128;
   fiat_p224_uint1 x129;
-  fiat_p224_addcarryx_u32(&x128, &x129, x127, x120, x123);
+  fiat_p224_addcarryx_u32(&x128, &x129, x127, x123, x120);
   uint32_t x130;
   fiat_p224_uint1 x131;
-  fiat_p224_addcarryx_u32(&x130, &x131, x129, x118, x121);
+  fiat_p224_addcarryx_u32(&x130, &x131, x129, x121, x118);
   uint32_t x132;
   fiat_p224_uint1 x133;
-  fiat_p224_addcarryx_u32(&x132, &x133, x131, 0x0, x119);
+  fiat_p224_addcarryx_u32(&x132, &x133, x131, x119, 0x0);
   uint32_t x134;
   fiat_p224_uint1 x135;
-  fiat_p224_addcarryx_u32(&x134, &x135, 0x0, x116, x100);
+  fiat_p224_addcarryx_u32(&x134, &x135, 0x0, x100, x116);
   uint32_t x136;
   fiat_p224_uint1 x137;
-  fiat_p224_addcarryx_u32(&x136, &x137, x135, 0x0, x102);
+  fiat_p224_addcarryx_u32(&x136, &x137, x135, x102, 0x0);
   uint32_t x138;
   fiat_p224_uint1 x139;
-  fiat_p224_addcarryx_u32(&x138, &x139, x137, 0x0, x104);
+  fiat_p224_addcarryx_u32(&x138, &x139, x137, x104, 0x0);
   uint32_t x140;
   fiat_p224_uint1 x141;
-  fiat_p224_addcarryx_u32(&x140, &x141, x139, x124, x106);
+  fiat_p224_addcarryx_u32(&x140, &x141, x139, x106, x124);
   uint32_t x142;
   fiat_p224_uint1 x143;
-  fiat_p224_addcarryx_u32(&x142, &x143, x141, x126, x108);
+  fiat_p224_addcarryx_u32(&x142, &x143, x141, x108, x126);
   uint32_t x144;
   fiat_p224_uint1 x145;
-  fiat_p224_addcarryx_u32(&x144, &x145, x143, x128, x110);
+  fiat_p224_addcarryx_u32(&x144, &x145, x143, x110, x128);
   uint32_t x146;
   fiat_p224_uint1 x147;
-  fiat_p224_addcarryx_u32(&x146, &x147, x145, x130, x112);
+  fiat_p224_addcarryx_u32(&x146, &x147, x145, x112, x130);
   uint32_t x148;
   fiat_p224_uint1 x149;
-  fiat_p224_addcarryx_u32(&x148, &x149, x147, x132, x114);
+  fiat_p224_addcarryx_u32(&x148, &x149, x147, x114, x132);
   uint32_t x150;
   fiat_p224_uint1 x151;
-  fiat_p224_addcarryx_u32(&x150, &x151, x149, 0x0, x115);
+  fiat_p224_addcarryx_u32(&x150, &x151, x149, x115, 0x0);
   uint32_t x152;
   uint32_t x153;
   fiat_p224_mulx_u32(&x152, &x153, x2, (arg1[6]));
@@ -1246,49 +1246,49 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x164, &x165, x2, (arg1[0]));
   uint32_t x166;
   fiat_p224_uint1 x167;
-  fiat_p224_addcarryx_u32(&x166, &x167, 0x0, x162, x165);
+  fiat_p224_addcarryx_u32(&x166, &x167, 0x0, x165, x162);
   uint32_t x168;
   fiat_p224_uint1 x169;
-  fiat_p224_addcarryx_u32(&x168, &x169, x167, x160, x163);
+  fiat_p224_addcarryx_u32(&x168, &x169, x167, x163, x160);
   uint32_t x170;
   fiat_p224_uint1 x171;
-  fiat_p224_addcarryx_u32(&x170, &x171, x169, x158, x161);
+  fiat_p224_addcarryx_u32(&x170, &x171, x169, x161, x158);
   uint32_t x172;
   fiat_p224_uint1 x173;
-  fiat_p224_addcarryx_u32(&x172, &x173, x171, x156, x159);
+  fiat_p224_addcarryx_u32(&x172, &x173, x171, x159, x156);
   uint32_t x174;
   fiat_p224_uint1 x175;
-  fiat_p224_addcarryx_u32(&x174, &x175, x173, x154, x157);
+  fiat_p224_addcarryx_u32(&x174, &x175, x173, x157, x154);
   uint32_t x176;
   fiat_p224_uint1 x177;
-  fiat_p224_addcarryx_u32(&x176, &x177, x175, x152, x155);
+  fiat_p224_addcarryx_u32(&x176, &x177, x175, x155, x152);
   uint32_t x178;
   fiat_p224_uint1 x179;
-  fiat_p224_addcarryx_u32(&x178, &x179, x177, 0x0, x153);
+  fiat_p224_addcarryx_u32(&x178, &x179, x177, x153, 0x0);
   uint32_t x180;
   fiat_p224_uint1 x181;
-  fiat_p224_addcarryx_u32(&x180, &x181, 0x0, x164, x136);
+  fiat_p224_addcarryx_u32(&x180, &x181, 0x0, x136, x164);
   uint32_t x182;
   fiat_p224_uint1 x183;
-  fiat_p224_addcarryx_u32(&x182, &x183, x181, x166, x138);
+  fiat_p224_addcarryx_u32(&x182, &x183, x181, x138, x166);
   uint32_t x184;
   fiat_p224_uint1 x185;
-  fiat_p224_addcarryx_u32(&x184, &x185, x183, x168, x140);
+  fiat_p224_addcarryx_u32(&x184, &x185, x183, x140, x168);
   uint32_t x186;
   fiat_p224_uint1 x187;
-  fiat_p224_addcarryx_u32(&x186, &x187, x185, x170, x142);
+  fiat_p224_addcarryx_u32(&x186, &x187, x185, x142, x170);
   uint32_t x188;
   fiat_p224_uint1 x189;
-  fiat_p224_addcarryx_u32(&x188, &x189, x187, x172, x144);
+  fiat_p224_addcarryx_u32(&x188, &x189, x187, x144, x172);
   uint32_t x190;
   fiat_p224_uint1 x191;
-  fiat_p224_addcarryx_u32(&x190, &x191, x189, x174, x146);
+  fiat_p224_addcarryx_u32(&x190, &x191, x189, x146, x174);
   uint32_t x192;
   fiat_p224_uint1 x193;
-  fiat_p224_addcarryx_u32(&x192, &x193, x191, x176, x148);
+  fiat_p224_addcarryx_u32(&x192, &x193, x191, x148, x176);
   uint32_t x194;
   fiat_p224_uint1 x195;
-  fiat_p224_addcarryx_u32(&x194, &x195, x193, x178, x150);
+  fiat_p224_addcarryx_u32(&x194, &x195, x193, x150, x178);
   uint32_t x196;
   uint32_t x197;
   fiat_p224_mulx_u32(&x196, &x197, x180, UINT32_C(0xffffffff));
@@ -1306,43 +1306,43 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x204, &x205, x196, UINT32_C(0xffffffff));
   uint32_t x206;
   fiat_p224_uint1 x207;
-  fiat_p224_addcarryx_u32(&x206, &x207, 0x0, x202, x205);
+  fiat_p224_addcarryx_u32(&x206, &x207, 0x0, x205, x202);
   uint32_t x208;
   fiat_p224_uint1 x209;
-  fiat_p224_addcarryx_u32(&x208, &x209, x207, x200, x203);
+  fiat_p224_addcarryx_u32(&x208, &x209, x207, x203, x200);
   uint32_t x210;
   fiat_p224_uint1 x211;
-  fiat_p224_addcarryx_u32(&x210, &x211, x209, x198, x201);
+  fiat_p224_addcarryx_u32(&x210, &x211, x209, x201, x198);
   uint32_t x212;
   fiat_p224_uint1 x213;
-  fiat_p224_addcarryx_u32(&x212, &x213, x211, 0x0, x199);
+  fiat_p224_addcarryx_u32(&x212, &x213, x211, x199, 0x0);
   uint32_t x214;
   fiat_p224_uint1 x215;
-  fiat_p224_addcarryx_u32(&x214, &x215, 0x0, x196, x180);
+  fiat_p224_addcarryx_u32(&x214, &x215, 0x0, x180, x196);
   uint32_t x216;
   fiat_p224_uint1 x217;
-  fiat_p224_addcarryx_u32(&x216, &x217, x215, 0x0, x182);
+  fiat_p224_addcarryx_u32(&x216, &x217, x215, x182, 0x0);
   uint32_t x218;
   fiat_p224_uint1 x219;
-  fiat_p224_addcarryx_u32(&x218, &x219, x217, 0x0, x184);
+  fiat_p224_addcarryx_u32(&x218, &x219, x217, x184, 0x0);
   uint32_t x220;
   fiat_p224_uint1 x221;
-  fiat_p224_addcarryx_u32(&x220, &x221, x219, x204, x186);
+  fiat_p224_addcarryx_u32(&x220, &x221, x219, x186, x204);
   uint32_t x222;
   fiat_p224_uint1 x223;
-  fiat_p224_addcarryx_u32(&x222, &x223, x221, x206, x188);
+  fiat_p224_addcarryx_u32(&x222, &x223, x221, x188, x206);
   uint32_t x224;
   fiat_p224_uint1 x225;
-  fiat_p224_addcarryx_u32(&x224, &x225, x223, x208, x190);
+  fiat_p224_addcarryx_u32(&x224, &x225, x223, x190, x208);
   uint32_t x226;
   fiat_p224_uint1 x227;
-  fiat_p224_addcarryx_u32(&x226, &x227, x225, x210, x192);
+  fiat_p224_addcarryx_u32(&x226, &x227, x225, x192, x210);
   uint32_t x228;
   fiat_p224_uint1 x229;
-  fiat_p224_addcarryx_u32(&x228, &x229, x227, x212, x194);
+  fiat_p224_addcarryx_u32(&x228, &x229, x227, x194, x212);
   uint32_t x230;
   fiat_p224_uint1 x231;
-  fiat_p224_addcarryx_u32(&x230, &x231, x229, 0x0, x195);
+  fiat_p224_addcarryx_u32(&x230, &x231, x229, x195, 0x0);
   uint32_t x232;
   uint32_t x233;
   fiat_p224_mulx_u32(&x232, &x233, x3, (arg1[6]));
@@ -1366,49 +1366,49 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x244, &x245, x3, (arg1[0]));
   uint32_t x246;
   fiat_p224_uint1 x247;
-  fiat_p224_addcarryx_u32(&x246, &x247, 0x0, x242, x245);
+  fiat_p224_addcarryx_u32(&x246, &x247, 0x0, x245, x242);
   uint32_t x248;
   fiat_p224_uint1 x249;
-  fiat_p224_addcarryx_u32(&x248, &x249, x247, x240, x243);
+  fiat_p224_addcarryx_u32(&x248, &x249, x247, x243, x240);
   uint32_t x250;
   fiat_p224_uint1 x251;
-  fiat_p224_addcarryx_u32(&x250, &x251, x249, x238, x241);
+  fiat_p224_addcarryx_u32(&x250, &x251, x249, x241, x238);
   uint32_t x252;
   fiat_p224_uint1 x253;
-  fiat_p224_addcarryx_u32(&x252, &x253, x251, x236, x239);
+  fiat_p224_addcarryx_u32(&x252, &x253, x251, x239, x236);
   uint32_t x254;
   fiat_p224_uint1 x255;
-  fiat_p224_addcarryx_u32(&x254, &x255, x253, x234, x237);
+  fiat_p224_addcarryx_u32(&x254, &x255, x253, x237, x234);
   uint32_t x256;
   fiat_p224_uint1 x257;
-  fiat_p224_addcarryx_u32(&x256, &x257, x255, x232, x235);
+  fiat_p224_addcarryx_u32(&x256, &x257, x255, x235, x232);
   uint32_t x258;
   fiat_p224_uint1 x259;
-  fiat_p224_addcarryx_u32(&x258, &x259, x257, 0x0, x233);
+  fiat_p224_addcarryx_u32(&x258, &x259, x257, x233, 0x0);
   uint32_t x260;
   fiat_p224_uint1 x261;
-  fiat_p224_addcarryx_u32(&x260, &x261, 0x0, x244, x216);
+  fiat_p224_addcarryx_u32(&x260, &x261, 0x0, x216, x244);
   uint32_t x262;
   fiat_p224_uint1 x263;
-  fiat_p224_addcarryx_u32(&x262, &x263, x261, x246, x218);
+  fiat_p224_addcarryx_u32(&x262, &x263, x261, x218, x246);
   uint32_t x264;
   fiat_p224_uint1 x265;
-  fiat_p224_addcarryx_u32(&x264, &x265, x263, x248, x220);
+  fiat_p224_addcarryx_u32(&x264, &x265, x263, x220, x248);
   uint32_t x266;
   fiat_p224_uint1 x267;
-  fiat_p224_addcarryx_u32(&x266, &x267, x265, x250, x222);
+  fiat_p224_addcarryx_u32(&x266, &x267, x265, x222, x250);
   uint32_t x268;
   fiat_p224_uint1 x269;
-  fiat_p224_addcarryx_u32(&x268, &x269, x267, x252, x224);
+  fiat_p224_addcarryx_u32(&x268, &x269, x267, x224, x252);
   uint32_t x270;
   fiat_p224_uint1 x271;
-  fiat_p224_addcarryx_u32(&x270, &x271, x269, x254, x226);
+  fiat_p224_addcarryx_u32(&x270, &x271, x269, x226, x254);
   uint32_t x272;
   fiat_p224_uint1 x273;
-  fiat_p224_addcarryx_u32(&x272, &x273, x271, x256, x228);
+  fiat_p224_addcarryx_u32(&x272, &x273, x271, x228, x256);
   uint32_t x274;
   fiat_p224_uint1 x275;
-  fiat_p224_addcarryx_u32(&x274, &x275, x273, x258, x230);
+  fiat_p224_addcarryx_u32(&x274, &x275, x273, x230, x258);
   uint32_t x276;
   uint32_t x277;
   fiat_p224_mulx_u32(&x276, &x277, x260, UINT32_C(0xffffffff));
@@ -1426,43 +1426,43 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x284, &x285, x276, UINT32_C(0xffffffff));
   uint32_t x286;
   fiat_p224_uint1 x287;
-  fiat_p224_addcarryx_u32(&x286, &x287, 0x0, x282, x285);
+  fiat_p224_addcarryx_u32(&x286, &x287, 0x0, x285, x282);
   uint32_t x288;
   fiat_p224_uint1 x289;
-  fiat_p224_addcarryx_u32(&x288, &x289, x287, x280, x283);
+  fiat_p224_addcarryx_u32(&x288, &x289, x287, x283, x280);
   uint32_t x290;
   fiat_p224_uint1 x291;
-  fiat_p224_addcarryx_u32(&x290, &x291, x289, x278, x281);
+  fiat_p224_addcarryx_u32(&x290, &x291, x289, x281, x278);
   uint32_t x292;
   fiat_p224_uint1 x293;
-  fiat_p224_addcarryx_u32(&x292, &x293, x291, 0x0, x279);
+  fiat_p224_addcarryx_u32(&x292, &x293, x291, x279, 0x0);
   uint32_t x294;
   fiat_p224_uint1 x295;
-  fiat_p224_addcarryx_u32(&x294, &x295, 0x0, x276, x260);
+  fiat_p224_addcarryx_u32(&x294, &x295, 0x0, x260, x276);
   uint32_t x296;
   fiat_p224_uint1 x297;
-  fiat_p224_addcarryx_u32(&x296, &x297, x295, 0x0, x262);
+  fiat_p224_addcarryx_u32(&x296, &x297, x295, x262, 0x0);
   uint32_t x298;
   fiat_p224_uint1 x299;
-  fiat_p224_addcarryx_u32(&x298, &x299, x297, 0x0, x264);
+  fiat_p224_addcarryx_u32(&x298, &x299, x297, x264, 0x0);
   uint32_t x300;
   fiat_p224_uint1 x301;
-  fiat_p224_addcarryx_u32(&x300, &x301, x299, x284, x266);
+  fiat_p224_addcarryx_u32(&x300, &x301, x299, x266, x284);
   uint32_t x302;
   fiat_p224_uint1 x303;
-  fiat_p224_addcarryx_u32(&x302, &x303, x301, x286, x268);
+  fiat_p224_addcarryx_u32(&x302, &x303, x301, x268, x286);
   uint32_t x304;
   fiat_p224_uint1 x305;
-  fiat_p224_addcarryx_u32(&x304, &x305, x303, x288, x270);
+  fiat_p224_addcarryx_u32(&x304, &x305, x303, x270, x288);
   uint32_t x306;
   fiat_p224_uint1 x307;
-  fiat_p224_addcarryx_u32(&x306, &x307, x305, x290, x272);
+  fiat_p224_addcarryx_u32(&x306, &x307, x305, x272, x290);
   uint32_t x308;
   fiat_p224_uint1 x309;
-  fiat_p224_addcarryx_u32(&x308, &x309, x307, x292, x274);
+  fiat_p224_addcarryx_u32(&x308, &x309, x307, x274, x292);
   uint32_t x310;
   fiat_p224_uint1 x311;
-  fiat_p224_addcarryx_u32(&x310, &x311, x309, 0x0, x275);
+  fiat_p224_addcarryx_u32(&x310, &x311, x309, x275, 0x0);
   uint32_t x312;
   uint32_t x313;
   fiat_p224_mulx_u32(&x312, &x313, x4, (arg1[6]));
@@ -1486,49 +1486,49 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x324, &x325, x4, (arg1[0]));
   uint32_t x326;
   fiat_p224_uint1 x327;
-  fiat_p224_addcarryx_u32(&x326, &x327, 0x0, x322, x325);
+  fiat_p224_addcarryx_u32(&x326, &x327, 0x0, x325, x322);
   uint32_t x328;
   fiat_p224_uint1 x329;
-  fiat_p224_addcarryx_u32(&x328, &x329, x327, x320, x323);
+  fiat_p224_addcarryx_u32(&x328, &x329, x327, x323, x320);
   uint32_t x330;
   fiat_p224_uint1 x331;
-  fiat_p224_addcarryx_u32(&x330, &x331, x329, x318, x321);
+  fiat_p224_addcarryx_u32(&x330, &x331, x329, x321, x318);
   uint32_t x332;
   fiat_p224_uint1 x333;
-  fiat_p224_addcarryx_u32(&x332, &x333, x331, x316, x319);
+  fiat_p224_addcarryx_u32(&x332, &x333, x331, x319, x316);
   uint32_t x334;
   fiat_p224_uint1 x335;
-  fiat_p224_addcarryx_u32(&x334, &x335, x333, x314, x317);
+  fiat_p224_addcarryx_u32(&x334, &x335, x333, x317, x314);
   uint32_t x336;
   fiat_p224_uint1 x337;
-  fiat_p224_addcarryx_u32(&x336, &x337, x335, x312, x315);
+  fiat_p224_addcarryx_u32(&x336, &x337, x335, x315, x312);
   uint32_t x338;
   fiat_p224_uint1 x339;
-  fiat_p224_addcarryx_u32(&x338, &x339, x337, 0x0, x313);
+  fiat_p224_addcarryx_u32(&x338, &x339, x337, x313, 0x0);
   uint32_t x340;
   fiat_p224_uint1 x341;
-  fiat_p224_addcarryx_u32(&x340, &x341, 0x0, x324, x296);
+  fiat_p224_addcarryx_u32(&x340, &x341, 0x0, x296, x324);
   uint32_t x342;
   fiat_p224_uint1 x343;
-  fiat_p224_addcarryx_u32(&x342, &x343, x341, x326, x298);
+  fiat_p224_addcarryx_u32(&x342, &x343, x341, x298, x326);
   uint32_t x344;
   fiat_p224_uint1 x345;
-  fiat_p224_addcarryx_u32(&x344, &x345, x343, x328, x300);
+  fiat_p224_addcarryx_u32(&x344, &x345, x343, x300, x328);
   uint32_t x346;
   fiat_p224_uint1 x347;
-  fiat_p224_addcarryx_u32(&x346, &x347, x345, x330, x302);
+  fiat_p224_addcarryx_u32(&x346, &x347, x345, x302, x330);
   uint32_t x348;
   fiat_p224_uint1 x349;
-  fiat_p224_addcarryx_u32(&x348, &x349, x347, x332, x304);
+  fiat_p224_addcarryx_u32(&x348, &x349, x347, x304, x332);
   uint32_t x350;
   fiat_p224_uint1 x351;
-  fiat_p224_addcarryx_u32(&x350, &x351, x349, x334, x306);
+  fiat_p224_addcarryx_u32(&x350, &x351, x349, x306, x334);
   uint32_t x352;
   fiat_p224_uint1 x353;
-  fiat_p224_addcarryx_u32(&x352, &x353, x351, x336, x308);
+  fiat_p224_addcarryx_u32(&x352, &x353, x351, x308, x336);
   uint32_t x354;
   fiat_p224_uint1 x355;
-  fiat_p224_addcarryx_u32(&x354, &x355, x353, x338, x310);
+  fiat_p224_addcarryx_u32(&x354, &x355, x353, x310, x338);
   uint32_t x356;
   uint32_t x357;
   fiat_p224_mulx_u32(&x356, &x357, x340, UINT32_C(0xffffffff));
@@ -1546,43 +1546,43 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x364, &x365, x356, UINT32_C(0xffffffff));
   uint32_t x366;
   fiat_p224_uint1 x367;
-  fiat_p224_addcarryx_u32(&x366, &x367, 0x0, x362, x365);
+  fiat_p224_addcarryx_u32(&x366, &x367, 0x0, x365, x362);
   uint32_t x368;
   fiat_p224_uint1 x369;
-  fiat_p224_addcarryx_u32(&x368, &x369, x367, x360, x363);
+  fiat_p224_addcarryx_u32(&x368, &x369, x367, x363, x360);
   uint32_t x370;
   fiat_p224_uint1 x371;
-  fiat_p224_addcarryx_u32(&x370, &x371, x369, x358, x361);
+  fiat_p224_addcarryx_u32(&x370, &x371, x369, x361, x358);
   uint32_t x372;
   fiat_p224_uint1 x373;
-  fiat_p224_addcarryx_u32(&x372, &x373, x371, 0x0, x359);
+  fiat_p224_addcarryx_u32(&x372, &x373, x371, x359, 0x0);
   uint32_t x374;
   fiat_p224_uint1 x375;
-  fiat_p224_addcarryx_u32(&x374, &x375, 0x0, x356, x340);
+  fiat_p224_addcarryx_u32(&x374, &x375, 0x0, x340, x356);
   uint32_t x376;
   fiat_p224_uint1 x377;
-  fiat_p224_addcarryx_u32(&x376, &x377, x375, 0x0, x342);
+  fiat_p224_addcarryx_u32(&x376, &x377, x375, x342, 0x0);
   uint32_t x378;
   fiat_p224_uint1 x379;
-  fiat_p224_addcarryx_u32(&x378, &x379, x377, 0x0, x344);
+  fiat_p224_addcarryx_u32(&x378, &x379, x377, x344, 0x0);
   uint32_t x380;
   fiat_p224_uint1 x381;
-  fiat_p224_addcarryx_u32(&x380, &x381, x379, x364, x346);
+  fiat_p224_addcarryx_u32(&x380, &x381, x379, x346, x364);
   uint32_t x382;
   fiat_p224_uint1 x383;
-  fiat_p224_addcarryx_u32(&x382, &x383, x381, x366, x348);
+  fiat_p224_addcarryx_u32(&x382, &x383, x381, x348, x366);
   uint32_t x384;
   fiat_p224_uint1 x385;
-  fiat_p224_addcarryx_u32(&x384, &x385, x383, x368, x350);
+  fiat_p224_addcarryx_u32(&x384, &x385, x383, x350, x368);
   uint32_t x386;
   fiat_p224_uint1 x387;
-  fiat_p224_addcarryx_u32(&x386, &x387, x385, x370, x352);
+  fiat_p224_addcarryx_u32(&x386, &x387, x385, x352, x370);
   uint32_t x388;
   fiat_p224_uint1 x389;
-  fiat_p224_addcarryx_u32(&x388, &x389, x387, x372, x354);
+  fiat_p224_addcarryx_u32(&x388, &x389, x387, x354, x372);
   uint32_t x390;
   fiat_p224_uint1 x391;
-  fiat_p224_addcarryx_u32(&x390, &x391, x389, 0x0, x355);
+  fiat_p224_addcarryx_u32(&x390, &x391, x389, x355, 0x0);
   uint32_t x392;
   uint32_t x393;
   fiat_p224_mulx_u32(&x392, &x393, x5, (arg1[6]));
@@ -1606,49 +1606,49 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x404, &x405, x5, (arg1[0]));
   uint32_t x406;
   fiat_p224_uint1 x407;
-  fiat_p224_addcarryx_u32(&x406, &x407, 0x0, x402, x405);
+  fiat_p224_addcarryx_u32(&x406, &x407, 0x0, x405, x402);
   uint32_t x408;
   fiat_p224_uint1 x409;
-  fiat_p224_addcarryx_u32(&x408, &x409, x407, x400, x403);
+  fiat_p224_addcarryx_u32(&x408, &x409, x407, x403, x400);
   uint32_t x410;
   fiat_p224_uint1 x411;
-  fiat_p224_addcarryx_u32(&x410, &x411, x409, x398, x401);
+  fiat_p224_addcarryx_u32(&x410, &x411, x409, x401, x398);
   uint32_t x412;
   fiat_p224_uint1 x413;
-  fiat_p224_addcarryx_u32(&x412, &x413, x411, x396, x399);
+  fiat_p224_addcarryx_u32(&x412, &x413, x411, x399, x396);
   uint32_t x414;
   fiat_p224_uint1 x415;
-  fiat_p224_addcarryx_u32(&x414, &x415, x413, x394, x397);
+  fiat_p224_addcarryx_u32(&x414, &x415, x413, x397, x394);
   uint32_t x416;
   fiat_p224_uint1 x417;
-  fiat_p224_addcarryx_u32(&x416, &x417, x415, x392, x395);
+  fiat_p224_addcarryx_u32(&x416, &x417, x415, x395, x392);
   uint32_t x418;
   fiat_p224_uint1 x419;
-  fiat_p224_addcarryx_u32(&x418, &x419, x417, 0x0, x393);
+  fiat_p224_addcarryx_u32(&x418, &x419, x417, x393, 0x0);
   uint32_t x420;
   fiat_p224_uint1 x421;
-  fiat_p224_addcarryx_u32(&x420, &x421, 0x0, x404, x376);
+  fiat_p224_addcarryx_u32(&x420, &x421, 0x0, x376, x404);
   uint32_t x422;
   fiat_p224_uint1 x423;
-  fiat_p224_addcarryx_u32(&x422, &x423, x421, x406, x378);
+  fiat_p224_addcarryx_u32(&x422, &x423, x421, x378, x406);
   uint32_t x424;
   fiat_p224_uint1 x425;
-  fiat_p224_addcarryx_u32(&x424, &x425, x423, x408, x380);
+  fiat_p224_addcarryx_u32(&x424, &x425, x423, x380, x408);
   uint32_t x426;
   fiat_p224_uint1 x427;
-  fiat_p224_addcarryx_u32(&x426, &x427, x425, x410, x382);
+  fiat_p224_addcarryx_u32(&x426, &x427, x425, x382, x410);
   uint32_t x428;
   fiat_p224_uint1 x429;
-  fiat_p224_addcarryx_u32(&x428, &x429, x427, x412, x384);
+  fiat_p224_addcarryx_u32(&x428, &x429, x427, x384, x412);
   uint32_t x430;
   fiat_p224_uint1 x431;
-  fiat_p224_addcarryx_u32(&x430, &x431, x429, x414, x386);
+  fiat_p224_addcarryx_u32(&x430, &x431, x429, x386, x414);
   uint32_t x432;
   fiat_p224_uint1 x433;
-  fiat_p224_addcarryx_u32(&x432, &x433, x431, x416, x388);
+  fiat_p224_addcarryx_u32(&x432, &x433, x431, x388, x416);
   uint32_t x434;
   fiat_p224_uint1 x435;
-  fiat_p224_addcarryx_u32(&x434, &x435, x433, x418, x390);
+  fiat_p224_addcarryx_u32(&x434, &x435, x433, x390, x418);
   uint32_t x436;
   uint32_t x437;
   fiat_p224_mulx_u32(&x436, &x437, x420, UINT32_C(0xffffffff));
@@ -1666,43 +1666,43 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x444, &x445, x436, UINT32_C(0xffffffff));
   uint32_t x446;
   fiat_p224_uint1 x447;
-  fiat_p224_addcarryx_u32(&x446, &x447, 0x0, x442, x445);
+  fiat_p224_addcarryx_u32(&x446, &x447, 0x0, x445, x442);
   uint32_t x448;
   fiat_p224_uint1 x449;
-  fiat_p224_addcarryx_u32(&x448, &x449, x447, x440, x443);
+  fiat_p224_addcarryx_u32(&x448, &x449, x447, x443, x440);
   uint32_t x450;
   fiat_p224_uint1 x451;
-  fiat_p224_addcarryx_u32(&x450, &x451, x449, x438, x441);
+  fiat_p224_addcarryx_u32(&x450, &x451, x449, x441, x438);
   uint32_t x452;
   fiat_p224_uint1 x453;
-  fiat_p224_addcarryx_u32(&x452, &x453, x451, 0x0, x439);
+  fiat_p224_addcarryx_u32(&x452, &x453, x451, x439, 0x0);
   uint32_t x454;
   fiat_p224_uint1 x455;
-  fiat_p224_addcarryx_u32(&x454, &x455, 0x0, x436, x420);
+  fiat_p224_addcarryx_u32(&x454, &x455, 0x0, x420, x436);
   uint32_t x456;
   fiat_p224_uint1 x457;
-  fiat_p224_addcarryx_u32(&x456, &x457, x455, 0x0, x422);
+  fiat_p224_addcarryx_u32(&x456, &x457, x455, x422, 0x0);
   uint32_t x458;
   fiat_p224_uint1 x459;
-  fiat_p224_addcarryx_u32(&x458, &x459, x457, 0x0, x424);
+  fiat_p224_addcarryx_u32(&x458, &x459, x457, x424, 0x0);
   uint32_t x460;
   fiat_p224_uint1 x461;
-  fiat_p224_addcarryx_u32(&x460, &x461, x459, x444, x426);
+  fiat_p224_addcarryx_u32(&x460, &x461, x459, x426, x444);
   uint32_t x462;
   fiat_p224_uint1 x463;
-  fiat_p224_addcarryx_u32(&x462, &x463, x461, x446, x428);
+  fiat_p224_addcarryx_u32(&x462, &x463, x461, x428, x446);
   uint32_t x464;
   fiat_p224_uint1 x465;
-  fiat_p224_addcarryx_u32(&x464, &x465, x463, x448, x430);
+  fiat_p224_addcarryx_u32(&x464, &x465, x463, x430, x448);
   uint32_t x466;
   fiat_p224_uint1 x467;
-  fiat_p224_addcarryx_u32(&x466, &x467, x465, x450, x432);
+  fiat_p224_addcarryx_u32(&x466, &x467, x465, x432, x450);
   uint32_t x468;
   fiat_p224_uint1 x469;
-  fiat_p224_addcarryx_u32(&x468, &x469, x467, x452, x434);
+  fiat_p224_addcarryx_u32(&x468, &x469, x467, x434, x452);
   uint32_t x470;
   fiat_p224_uint1 x471;
-  fiat_p224_addcarryx_u32(&x470, &x471, x469, 0x0, x435);
+  fiat_p224_addcarryx_u32(&x470, &x471, x469, x435, 0x0);
   uint32_t x472;
   uint32_t x473;
   fiat_p224_mulx_u32(&x472, &x473, x6, (arg1[6]));
@@ -1726,49 +1726,49 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x484, &x485, x6, (arg1[0]));
   uint32_t x486;
   fiat_p224_uint1 x487;
-  fiat_p224_addcarryx_u32(&x486, &x487, 0x0, x482, x485);
+  fiat_p224_addcarryx_u32(&x486, &x487, 0x0, x485, x482);
   uint32_t x488;
   fiat_p224_uint1 x489;
-  fiat_p224_addcarryx_u32(&x488, &x489, x487, x480, x483);
+  fiat_p224_addcarryx_u32(&x488, &x489, x487, x483, x480);
   uint32_t x490;
   fiat_p224_uint1 x491;
-  fiat_p224_addcarryx_u32(&x490, &x491, x489, x478, x481);
+  fiat_p224_addcarryx_u32(&x490, &x491, x489, x481, x478);
   uint32_t x492;
   fiat_p224_uint1 x493;
-  fiat_p224_addcarryx_u32(&x492, &x493, x491, x476, x479);
+  fiat_p224_addcarryx_u32(&x492, &x493, x491, x479, x476);
   uint32_t x494;
   fiat_p224_uint1 x495;
-  fiat_p224_addcarryx_u32(&x494, &x495, x493, x474, x477);
+  fiat_p224_addcarryx_u32(&x494, &x495, x493, x477, x474);
   uint32_t x496;
   fiat_p224_uint1 x497;
-  fiat_p224_addcarryx_u32(&x496, &x497, x495, x472, x475);
+  fiat_p224_addcarryx_u32(&x496, &x497, x495, x475, x472);
   uint32_t x498;
   fiat_p224_uint1 x499;
-  fiat_p224_addcarryx_u32(&x498, &x499, x497, 0x0, x473);
+  fiat_p224_addcarryx_u32(&x498, &x499, x497, x473, 0x0);
   uint32_t x500;
   fiat_p224_uint1 x501;
-  fiat_p224_addcarryx_u32(&x500, &x501, 0x0, x484, x456);
+  fiat_p224_addcarryx_u32(&x500, &x501, 0x0, x456, x484);
   uint32_t x502;
   fiat_p224_uint1 x503;
-  fiat_p224_addcarryx_u32(&x502, &x503, x501, x486, x458);
+  fiat_p224_addcarryx_u32(&x502, &x503, x501, x458, x486);
   uint32_t x504;
   fiat_p224_uint1 x505;
-  fiat_p224_addcarryx_u32(&x504, &x505, x503, x488, x460);
+  fiat_p224_addcarryx_u32(&x504, &x505, x503, x460, x488);
   uint32_t x506;
   fiat_p224_uint1 x507;
-  fiat_p224_addcarryx_u32(&x506, &x507, x505, x490, x462);
+  fiat_p224_addcarryx_u32(&x506, &x507, x505, x462, x490);
   uint32_t x508;
   fiat_p224_uint1 x509;
-  fiat_p224_addcarryx_u32(&x508, &x509, x507, x492, x464);
+  fiat_p224_addcarryx_u32(&x508, &x509, x507, x464, x492);
   uint32_t x510;
   fiat_p224_uint1 x511;
-  fiat_p224_addcarryx_u32(&x510, &x511, x509, x494, x466);
+  fiat_p224_addcarryx_u32(&x510, &x511, x509, x466, x494);
   uint32_t x512;
   fiat_p224_uint1 x513;
-  fiat_p224_addcarryx_u32(&x512, &x513, x511, x496, x468);
+  fiat_p224_addcarryx_u32(&x512, &x513, x511, x468, x496);
   uint32_t x514;
   fiat_p224_uint1 x515;
-  fiat_p224_addcarryx_u32(&x514, &x515, x513, x498, x470);
+  fiat_p224_addcarryx_u32(&x514, &x515, x513, x470, x498);
   uint32_t x516;
   uint32_t x517;
   fiat_p224_mulx_u32(&x516, &x517, x500, UINT32_C(0xffffffff));
@@ -1786,43 +1786,43 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_mulx_u32(&x524, &x525, x516, UINT32_C(0xffffffff));
   uint32_t x526;
   fiat_p224_uint1 x527;
-  fiat_p224_addcarryx_u32(&x526, &x527, 0x0, x522, x525);
+  fiat_p224_addcarryx_u32(&x526, &x527, 0x0, x525, x522);
   uint32_t x528;
   fiat_p224_uint1 x529;
-  fiat_p224_addcarryx_u32(&x528, &x529, x527, x520, x523);
+  fiat_p224_addcarryx_u32(&x528, &x529, x527, x523, x520);
   uint32_t x530;
   fiat_p224_uint1 x531;
-  fiat_p224_addcarryx_u32(&x530, &x531, x529, x518, x521);
+  fiat_p224_addcarryx_u32(&x530, &x531, x529, x521, x518);
   uint32_t x532;
   fiat_p224_uint1 x533;
-  fiat_p224_addcarryx_u32(&x532, &x533, x531, 0x0, x519);
+  fiat_p224_addcarryx_u32(&x532, &x533, x531, x519, 0x0);
   uint32_t x534;
   fiat_p224_uint1 x535;
-  fiat_p224_addcarryx_u32(&x534, &x535, 0x0, x516, x500);
+  fiat_p224_addcarryx_u32(&x534, &x535, 0x0, x500, x516);
   uint32_t x536;
   fiat_p224_uint1 x537;
-  fiat_p224_addcarryx_u32(&x536, &x537, x535, 0x0, x502);
+  fiat_p224_addcarryx_u32(&x536, &x537, x535, x502, 0x0);
   uint32_t x538;
   fiat_p224_uint1 x539;
-  fiat_p224_addcarryx_u32(&x538, &x539, x537, 0x0, x504);
+  fiat_p224_addcarryx_u32(&x538, &x539, x537, x504, 0x0);
   uint32_t x540;
   fiat_p224_uint1 x541;
-  fiat_p224_addcarryx_u32(&x540, &x541, x539, x524, x506);
+  fiat_p224_addcarryx_u32(&x540, &x541, x539, x506, x524);
   uint32_t x542;
   fiat_p224_uint1 x543;
-  fiat_p224_addcarryx_u32(&x542, &x543, x541, x526, x508);
+  fiat_p224_addcarryx_u32(&x542, &x543, x541, x508, x526);
   uint32_t x544;
   fiat_p224_uint1 x545;
-  fiat_p224_addcarryx_u32(&x544, &x545, x543, x528, x510);
+  fiat_p224_addcarryx_u32(&x544, &x545, x543, x510, x528);
   uint32_t x546;
   fiat_p224_uint1 x547;
-  fiat_p224_addcarryx_u32(&x546, &x547, x545, x530, x512);
+  fiat_p224_addcarryx_u32(&x546, &x547, x545, x512, x530);
   uint32_t x548;
   fiat_p224_uint1 x549;
-  fiat_p224_addcarryx_u32(&x548, &x549, x547, x532, x514);
+  fiat_p224_addcarryx_u32(&x548, &x549, x547, x514, x532);
   uint32_t x550;
   fiat_p224_uint1 x551;
-  fiat_p224_addcarryx_u32(&x550, &x551, x549, 0x0, x515);
+  fiat_p224_addcarryx_u32(&x550, &x551, x549, x515, 0x0);
   uint32_t x552;
   fiat_p224_uint1 x553;
   fiat_p224_subborrowx_u32(&x552, &x553, 0x0, x536, 0x1);
@@ -1888,25 +1888,25 @@ static void fiat_p224_square(uint32_t out1[7], const uint32_t arg1[7]) {
 static void fiat_p224_add(uint32_t out1[7], const uint32_t arg1[7], const uint32_t arg2[7]) {
   uint32_t x1;
   fiat_p224_uint1 x2;
-  fiat_p224_addcarryx_u32(&x1, &x2, 0x0, (arg2[0]), (arg1[0]));
+  fiat_p224_addcarryx_u32(&x1, &x2, 0x0, (arg1[0]), (arg2[0]));
   uint32_t x3;
   fiat_p224_uint1 x4;
-  fiat_p224_addcarryx_u32(&x3, &x4, x2, (arg2[1]), (arg1[1]));
+  fiat_p224_addcarryx_u32(&x3, &x4, x2, (arg1[1]), (arg2[1]));
   uint32_t x5;
   fiat_p224_uint1 x6;
-  fiat_p224_addcarryx_u32(&x5, &x6, x4, (arg2[2]), (arg1[2]));
+  fiat_p224_addcarryx_u32(&x5, &x6, x4, (arg1[2]), (arg2[2]));
   uint32_t x7;
   fiat_p224_uint1 x8;
-  fiat_p224_addcarryx_u32(&x7, &x8, x6, (arg2[3]), (arg1[3]));
+  fiat_p224_addcarryx_u32(&x7, &x8, x6, (arg1[3]), (arg2[3]));
   uint32_t x9;
   fiat_p224_uint1 x10;
-  fiat_p224_addcarryx_u32(&x9, &x10, x8, (arg2[4]), (arg1[4]));
+  fiat_p224_addcarryx_u32(&x9, &x10, x8, (arg1[4]), (arg2[4]));
   uint32_t x11;
   fiat_p224_uint1 x12;
-  fiat_p224_addcarryx_u32(&x11, &x12, x10, (arg2[5]), (arg1[5]));
+  fiat_p224_addcarryx_u32(&x11, &x12, x10, (arg1[5]), (arg2[5]));
   uint32_t x13;
   fiat_p224_uint1 x14;
-  fiat_p224_addcarryx_u32(&x13, &x14, x12, (arg2[6]), (arg1[6]));
+  fiat_p224_addcarryx_u32(&x13, &x14, x12, (arg1[6]), (arg2[6]));
   uint32_t x15;
   fiat_p224_uint1 x16;
   fiat_p224_subborrowx_u32(&x15, &x16, 0x0, x1, 0x1);
@@ -1995,25 +1995,25 @@ static void fiat_p224_sub(uint32_t out1[7], const uint32_t arg1[7], const uint32
   fiat_p224_cmovznz_u32(&x15, x14, 0x0, UINT32_C(0xffffffff));
   uint32_t x16;
   fiat_p224_uint1 x17;
-  fiat_p224_addcarryx_u32(&x16, &x17, 0x0, (fiat_p224_uint1)(x15 & 0x1), x1);
+  fiat_p224_addcarryx_u32(&x16, &x17, 0x0, x1, (fiat_p224_uint1)(x15 & 0x1));
   uint32_t x18;
   fiat_p224_uint1 x19;
-  fiat_p224_addcarryx_u32(&x18, &x19, x17, 0x0, x3);
+  fiat_p224_addcarryx_u32(&x18, &x19, x17, x3, 0x0);
   uint32_t x20;
   fiat_p224_uint1 x21;
-  fiat_p224_addcarryx_u32(&x20, &x21, x19, 0x0, x5);
+  fiat_p224_addcarryx_u32(&x20, &x21, x19, x5, 0x0);
   uint32_t x22;
   fiat_p224_uint1 x23;
-  fiat_p224_addcarryx_u32(&x22, &x23, x21, (x15 & UINT32_C(0xffffffff)), x7);
+  fiat_p224_addcarryx_u32(&x22, &x23, x21, x7, (x15 & UINT32_C(0xffffffff)));
   uint32_t x24;
   fiat_p224_uint1 x25;
-  fiat_p224_addcarryx_u32(&x24, &x25, x23, (x15 & UINT32_C(0xffffffff)), x9);
+  fiat_p224_addcarryx_u32(&x24, &x25, x23, x9, (x15 & UINT32_C(0xffffffff)));
   uint32_t x26;
   fiat_p224_uint1 x27;
-  fiat_p224_addcarryx_u32(&x26, &x27, x25, (x15 & UINT32_C(0xffffffff)), x11);
+  fiat_p224_addcarryx_u32(&x26, &x27, x25, x11, (x15 & UINT32_C(0xffffffff)));
   uint32_t x28;
   fiat_p224_uint1 x29;
-  fiat_p224_addcarryx_u32(&x28, &x29, x27, (x15 & UINT32_C(0xffffffff)), x13);
+  fiat_p224_addcarryx_u32(&x28, &x29, x27, x13, (x15 & UINT32_C(0xffffffff)));
   out1[0] = x16;
   out1[1] = x18;
   out1[2] = x20;
@@ -2062,25 +2062,25 @@ static void fiat_p224_opp(uint32_t out1[7], const uint32_t arg1[7]) {
   fiat_p224_cmovznz_u32(&x15, x14, 0x0, UINT32_C(0xffffffff));
   uint32_t x16;
   fiat_p224_uint1 x17;
-  fiat_p224_addcarryx_u32(&x16, &x17, 0x0, (fiat_p224_uint1)(x15 & 0x1), x1);
+  fiat_p224_addcarryx_u32(&x16, &x17, 0x0, x1, (fiat_p224_uint1)(x15 & 0x1));
   uint32_t x18;
   fiat_p224_uint1 x19;
-  fiat_p224_addcarryx_u32(&x18, &x19, x17, 0x0, x3);
+  fiat_p224_addcarryx_u32(&x18, &x19, x17, x3, 0x0);
   uint32_t x20;
   fiat_p224_uint1 x21;
-  fiat_p224_addcarryx_u32(&x20, &x21, x19, 0x0, x5);
+  fiat_p224_addcarryx_u32(&x20, &x21, x19, x5, 0x0);
   uint32_t x22;
   fiat_p224_uint1 x23;
-  fiat_p224_addcarryx_u32(&x22, &x23, x21, (x15 & UINT32_C(0xffffffff)), x7);
+  fiat_p224_addcarryx_u32(&x22, &x23, x21, x7, (x15 & UINT32_C(0xffffffff)));
   uint32_t x24;
   fiat_p224_uint1 x25;
-  fiat_p224_addcarryx_u32(&x24, &x25, x23, (x15 & UINT32_C(0xffffffff)), x9);
+  fiat_p224_addcarryx_u32(&x24, &x25, x23, x9, (x15 & UINT32_C(0xffffffff)));
   uint32_t x26;
   fiat_p224_uint1 x27;
-  fiat_p224_addcarryx_u32(&x26, &x27, x25, (x15 & UINT32_C(0xffffffff)), x11);
+  fiat_p224_addcarryx_u32(&x26, &x27, x25, x11, (x15 & UINT32_C(0xffffffff)));
   uint32_t x28;
   fiat_p224_uint1 x29;
-  fiat_p224_addcarryx_u32(&x28, &x29, x27, (x15 & UINT32_C(0xffffffff)), x13);
+  fiat_p224_addcarryx_u32(&x28, &x29, x27, x13, (x15 & UINT32_C(0xffffffff)));
   out1[0] = x16;
   out1[1] = x18;
   out1[2] = x20;
@@ -2122,22 +2122,22 @@ static void fiat_p224_from_montgomery(uint32_t out1[7], const uint32_t arg1[7])
   fiat_p224_mulx_u32(&x10, &x11, x2, UINT32_C(0xffffffff));
   uint32_t x12;
   fiat_p224_uint1 x13;
-  fiat_p224_addcarryx_u32(&x12, &x13, 0x0, x8, x11);
+  fiat_p224_addcarryx_u32(&x12, &x13, 0x0, x11, x8);
   uint32_t x14;
   fiat_p224_uint1 x15;
-  fiat_p224_addcarryx_u32(&x14, &x15, x13, x6, x9);
+  fiat_p224_addcarryx_u32(&x14, &x15, x13, x9, x6);
   uint32_t x16;
   fiat_p224_uint1 x17;
-  fiat_p224_addcarryx_u32(&x16, &x17, x15, x4, x7);
+  fiat_p224_addcarryx_u32(&x16, &x17, x15, x7, x4);
   uint32_t x18;
   fiat_p224_uint1 x19;
-  fiat_p224_addcarryx_u32(&x18, &x19, 0x0, x2, x1);
+  fiat_p224_addcarryx_u32(&x18, &x19, 0x0, x1, x2);
   uint32_t x20;
   fiat_p224_uint1 x21;
   fiat_p224_addcarryx_u32(&x20, &x21, x19, 0x0, 0x0);
   uint32_t x22;
   fiat_p224_uint1 x23;
-  fiat_p224_addcarryx_u32(&x22, &x23, 0x0, (arg1[1]), (fiat_p224_uint1)x20);
+  fiat_p224_addcarryx_u32(&x22, &x23, 0x0, (fiat_p224_uint1)x20, (arg1[1]));
   uint32_t x24;
   uint32_t x25;
   fiat_p224_mulx_u32(&x24, &x25, x22, UINT32_C(0xffffffff));
@@ -2155,64 +2155,64 @@ static void fiat_p224_from_montgomery(uint32_t out1[7], const uint32_t arg1[7])
   fiat_p224_mulx_u32(&x32, &x33, x24, UINT32_C(0xffffffff));
   uint32_t x34;
   fiat_p224_uint1 x35;
-  fiat_p224_addcarryx_u32(&x34, &x35, 0x0, x30, x33);
+  fiat_p224_addcarryx_u32(&x34, &x35, 0x0, x33, x30);
   uint32_t x36;
   fiat_p224_uint1 x37;
-  fiat_p224_addcarryx_u32(&x36, &x37, x35, x28, x31);
+  fiat_p224_addcarryx_u32(&x36, &x37, x35, x31, x28);
   uint32_t x38;
   fiat_p224_uint1 x39;
-  fiat_p224_addcarryx_u32(&x38, &x39, x37, x26, x29);
+  fiat_p224_addcarryx_u32(&x38, &x39, x37, x29, x26);
   uint32_t x40;
   fiat_p224_uint1 x41;
-  fiat_p224_addcarryx_u32(&x40, &x41, 0x0, x32, x12);
+  fiat_p224_addcarryx_u32(&x40, &x41, 0x0, x12, x32);
   uint32_t x42;
   fiat_p224_uint1 x43;
-  fiat_p224_addcarryx_u32(&x42, &x43, x41, x34, x14);
+  fiat_p224_addcarryx_u32(&x42, &x43, x41, x14, x34);
   uint32_t x44;
   fiat_p224_uint1 x45;
-  fiat_p224_addcarryx_u32(&x44, &x45, x43, x36, x16);
+  fiat_p224_addcarryx_u32(&x44, &x45, x43, x16, x36);
   uint32_t x46;
   fiat_p224_uint1 x47;
-  fiat_p224_addcarryx_u32(&x46, &x47, x17, 0x0, x5);
+  fiat_p224_addcarryx_u32(&x46, &x47, x17, x5, 0x0);
   uint32_t x48;
   fiat_p224_uint1 x49;
-  fiat_p224_addcarryx_u32(&x48, &x49, x45, x38, x46);
+  fiat_p224_addcarryx_u32(&x48, &x49, x45, x46, x38);
   uint32_t x50;
   fiat_p224_uint1 x51;
-  fiat_p224_addcarryx_u32(&x50, &x51, x39, 0x0, x27);
+  fiat_p224_addcarryx_u32(&x50, &x51, x39, x27, 0x0);
   uint32_t x52;
   fiat_p224_uint1 x53;
-  fiat_p224_addcarryx_u32(&x52, &x53, x49, x50, 0x0);
+  fiat_p224_addcarryx_u32(&x52, &x53, x49, 0x0, x50);
   uint32_t x54;
   fiat_p224_uint1 x55;
   fiat_p224_addcarryx_u32(&x54, &x55, x23, 0x0, 0x0);
   uint32_t x56;
   fiat_p224_uint1 x57;
-  fiat_p224_addcarryx_u32(&x56, &x57, 0x0, x24, x22);
+  fiat_p224_addcarryx_u32(&x56, &x57, 0x0, x22, x24);
   uint32_t x58;
   fiat_p224_uint1 x59;
-  fiat_p224_addcarryx_u32(&x58, &x59, x57, 0x0, (fiat_p224_uint1)x54);
+  fiat_p224_addcarryx_u32(&x58, &x59, x57, (fiat_p224_uint1)x54, 0x0);
   uint32_t x60;
   fiat_p224_uint1 x61;
-  fiat_p224_addcarryx_u32(&x60, &x61, 0x0, (arg1[2]), x58);
+  fiat_p224_addcarryx_u32(&x60, &x61, 0x0, x58, (arg1[2]));
   uint32_t x62;
   fiat_p224_uint1 x63;
-  fiat_p224_addcarryx_u32(&x62, &x63, x61, 0x0, x10);
+  fiat_p224_addcarryx_u32(&x62, &x63, x61, x10, 0x0);
   uint32_t x64;
   fiat_p224_uint1 x65;
-  fiat_p224_addcarryx_u32(&x64, &x65, x63, 0x0, x40);
+  fiat_p224_addcarryx_u32(&x64, &x65, x63, x40, 0x0);
   uint32_t x66;
   fiat_p224_uint1 x67;
-  fiat_p224_addcarryx_u32(&x66, &x67, x65, 0x0, x42);
+  fiat_p224_addcarryx_u32(&x66, &x67, x65, x42, 0x0);
   uint32_t x68;
   fiat_p224_uint1 x69;
-  fiat_p224_addcarryx_u32(&x68, &x69, x67, 0x0, x44);
+  fiat_p224_addcarryx_u32(&x68, &x69, x67, x44, 0x0);
   uint32_t x70;
   fiat_p224_uint1 x71;
-  fiat_p224_addcarryx_u32(&x70, &x71, x69, 0x0, x48);
+  fiat_p224_addcarryx_u32(&x70, &x71, x69, x48, 0x0);
   uint32_t x72;
   fiat_p224_uint1 x73;
-  fiat_p224_addcarryx_u32(&x72, &x73, x71, 0x0, x52);
+  fiat_p224_addcarryx_u32(&x72, &x73, x71, x52, 0x0);
   uint32_t x74;
   uint32_t x75;
   fiat_p224_mulx_u32(&x74, &x75, x60, UINT32_C(0xffffffff));
@@ -2230,67 +2230,67 @@ static void fiat_p224_from_montgomery(uint32_t out1[7], const uint32_t arg1[7])
   fiat_p224_mulx_u32(&x82, &x83, x74, UINT32_C(0xffffffff));
   uint32_t x84;
   fiat_p224_uint1 x85;
-  fiat_p224_addcarryx_u32(&x84, &x85, 0x0, x80, x83);
+  fiat_p224_addcarryx_u32(&x84, &x85, 0x0, x83, x80);
   uint32_t x86;
   fiat_p224_uint1 x87;
-  fiat_p224_addcarryx_u32(&x86, &x87, x85, x78, x81);
+  fiat_p224_addcarryx_u32(&x86, &x87, x85, x81, x78);
   uint32_t x88;
   fiat_p224_uint1 x89;
-  fiat_p224_addcarryx_u32(&x88, &x89, x87, x76, x79);
+  fiat_p224_addcarryx_u32(&x88, &x89, x87, x79, x76);
   uint32_t x90;
   fiat_p224_uint1 x91;
-  fiat_p224_addcarryx_u32(&x90, &x91, 0x0, x74, x60);
+  fiat_p224_addcarryx_u32(&x90, &x91, 0x0, x60, x74);
   uint32_t x92;
   fiat_p224_uint1 x93;
-  fiat_p224_addcarryx_u32(&x92, &x93, x91, 0x0, x62);
+  fiat_p224_addcarryx_u32(&x92, &x93, x91, x62, 0x0);
   uint32_t x94;
   fiat_p224_uint1 x95;
-  fiat_p224_addcarryx_u32(&x94, &x95, x93, 0x0, x64);
+  fiat_p224_addcarryx_u32(&x94, &x95, x93, x64, 0x0);
   uint32_t x96;
   fiat_p224_uint1 x97;
-  fiat_p224_addcarryx_u32(&x96, &x97, x95, x82, x66);
+  fiat_p224_addcarryx_u32(&x96, &x97, x95, x66, x82);
   uint32_t x98;
   fiat_p224_uint1 x99;
-  fiat_p224_addcarryx_u32(&x98, &x99, x97, x84, x68);
+  fiat_p224_addcarryx_u32(&x98, &x99, x97, x68, x84);
   uint32_t x100;
   fiat_p224_uint1 x101;
-  fiat_p224_addcarryx_u32(&x100, &x101, x99, x86, x70);
+  fiat_p224_addcarryx_u32(&x100, &x101, x99, x70, x86);
   uint32_t x102;
   fiat_p224_uint1 x103;
-  fiat_p224_addcarryx_u32(&x102, &x103, x101, x88, x72);
+  fiat_p224_addcarryx_u32(&x102, &x103, x101, x72, x88);
   uint32_t x104;
   fiat_p224_uint1 x105;
-  fiat_p224_addcarryx_u32(&x104, &x105, x53, 0x0, 0x0);
+  fiat_p224_addcarryx_u32(&x104, &x105, x89, x77, 0x0);
   uint32_t x106;
   fiat_p224_uint1 x107;
-  fiat_p224_addcarryx_u32(&x106, &x107, x73, 0x0, (fiat_p224_uint1)x104);
+  fiat_p224_addcarryx_u32(&x106, &x107, x53, 0x0, 0x0);
   uint32_t x108;
   fiat_p224_uint1 x109;
-  fiat_p224_addcarryx_u32(&x108, &x109, x89, 0x0, x77);
+  fiat_p224_addcarryx_u32(&x108, &x109, x73, (fiat_p224_uint1)x106, 0x0);
   uint32_t x110;
   fiat_p224_uint1 x111;
-  fiat_p224_addcarryx_u32(&x110, &x111, x103, x108, x106);
+  fiat_p224_addcarryx_u32(&x110, &x111, x103, x108, x104);
   uint32_t x112;
   fiat_p224_uint1 x113;
-  fiat_p224_addcarryx_u32(&x112, &x113, 0x0, (arg1[3]), x92);
+  fiat_p224_addcarryx_u32(&x112, &x113, 0x0, x92, (arg1[3]));
   uint32_t x114;
   fiat_p224_uint1 x115;
-  fiat_p224_addcarryx_u32(&x114, &x115, x113, 0x0, x94);
+  fiat_p224_addcarryx_u32(&x114, &x115, x113, x94, 0x0);
   uint32_t x116;
   fiat_p224_uint1 x117;
-  fiat_p224_addcarryx_u32(&x116, &x117, x115, 0x0, x96);
+  fiat_p224_addcarryx_u32(&x116, &x117, x115, x96, 0x0);
   uint32_t x118;
   fiat_p224_uint1 x119;
-  fiat_p224_addcarryx_u32(&x118, &x119, x117, 0x0, x98);
+  fiat_p224_addcarryx_u32(&x118, &x119, x117, x98, 0x0);
   uint32_t x120;
   fiat_p224_uint1 x121;
-  fiat_p224_addcarryx_u32(&x120, &x121, x119, 0x0, x100);
+  fiat_p224_addcarryx_u32(&x120, &x121, x119, x100, 0x0);
   uint32_t x122;
   fiat_p224_uint1 x123;
-  fiat_p224_addcarryx_u32(&x122, &x123, x121, 0x0, x102);
+  fiat_p224_addcarryx_u32(&x122, &x123, x121, x102, 0x0);
   uint32_t x124;
   fiat_p224_uint1 x125;
-  fiat_p224_addcarryx_u32(&x124, &x125, x123, 0x0, x110);
+  fiat_p224_addcarryx_u32(&x124, &x125, x123, x110, 0x0);
   uint32_t x126;
   uint32_t x127;
   fiat_p224_mulx_u32(&x126, &x127, x112, UINT32_C(0xffffffff));
@@ -2308,67 +2308,67 @@ static void fiat_p224_from_montgomery(uint32_t out1[7], const uint32_t arg1[7])
   fiat_p224_mulx_u32(&x134, &x135, x126, UINT32_C(0xffffffff));
   uint32_t x136;
   fiat_p224_uint1 x137;
-  fiat_p224_addcarryx_u32(&x136, &x137, 0x0, x132, x135);
+  fiat_p224_addcarryx_u32(&x136, &x137, 0x0, x135, x132);
   uint32_t x138;
   fiat_p224_uint1 x139;
-  fiat_p224_addcarryx_u32(&x138, &x139, x137, x130, x133);
+  fiat_p224_addcarryx_u32(&x138, &x139, x137, x133, x130);
   uint32_t x140;
   fiat_p224_uint1 x141;
-  fiat_p224_addcarryx_u32(&x140, &x141, x139, x128, x131);
+  fiat_p224_addcarryx_u32(&x140, &x141, x139, x131, x128);
   uint32_t x142;
   fiat_p224_uint1 x143;
-  fiat_p224_addcarryx_u32(&x142, &x143, 0x0, x126, x112);
+  fiat_p224_addcarryx_u32(&x142, &x143, 0x0, x112, x126);
   uint32_t x144;
   fiat_p224_uint1 x145;
-  fiat_p224_addcarryx_u32(&x144, &x145, x143, 0x0, x114);
+  fiat_p224_addcarryx_u32(&x144, &x145, x143, x114, 0x0);
   uint32_t x146;
   fiat_p224_uint1 x147;
-  fiat_p224_addcarryx_u32(&x146, &x147, x145, 0x0, x116);
+  fiat_p224_addcarryx_u32(&x146, &x147, x145, x116, 0x0);
   uint32_t x148;
   fiat_p224_uint1 x149;
-  fiat_p224_addcarryx_u32(&x148, &x149, x147, x134, x118);
+  fiat_p224_addcarryx_u32(&x148, &x149, x147, x118, x134);
   uint32_t x150;
   fiat_p224_uint1 x151;
-  fiat_p224_addcarryx_u32(&x150, &x151, x149, x136, x120);
+  fiat_p224_addcarryx_u32(&x150, &x151, x149, x120, x136);
   uint32_t x152;
   fiat_p224_uint1 x153;
-  fiat_p224_addcarryx_u32(&x152, &x153, x151, x138, x122);
+  fiat_p224_addcarryx_u32(&x152, &x153, x151, x122, x138);
   uint32_t x154;
   fiat_p224_uint1 x155;
-  fiat_p224_addcarryx_u32(&x154, &x155, x153, x140, x124);
+  fiat_p224_addcarryx_u32(&x154, &x155, x153, x124, x140);
   uint32_t x156;
   fiat_p224_uint1 x157;
-  fiat_p224_addcarryx_u32(&x156, &x157, x111, 0x0, 0x0);
+  fiat_p224_addcarryx_u32(&x156, &x157, x141, x129, 0x0);
   uint32_t x158;
   fiat_p224_uint1 x159;
-  fiat_p224_addcarryx_u32(&x158, &x159, x125, 0x0, (fiat_p224_uint1)x156);
+  fiat_p224_addcarryx_u32(&x158, &x159, x111, 0x0, 0x0);
   uint32_t x160;
   fiat_p224_uint1 x161;
-  fiat_p224_addcarryx_u32(&x160, &x161, x141, 0x0, x129);
+  fiat_p224_addcarryx_u32(&x160, &x161, x125, (fiat_p224_uint1)x158, 0x0);
   uint32_t x162;
   fiat_p224_uint1 x163;
-  fiat_p224_addcarryx_u32(&x162, &x163, x155, x160, x158);
+  fiat_p224_addcarryx_u32(&x162, &x163, x155, x160, x156);
   uint32_t x164;
   fiat_p224_uint1 x165;
-  fiat_p224_addcarryx_u32(&x164, &x165, 0x0, (arg1[4]), x144);
+  fiat_p224_addcarryx_u32(&x164, &x165, 0x0, x144, (arg1[4]));
   uint32_t x166;
   fiat_p224_uint1 x167;
-  fiat_p224_addcarryx_u32(&x166, &x167, x165, 0x0, x146);
+  fiat_p224_addcarryx_u32(&x166, &x167, x165, x146, 0x0);
   uint32_t x168;
   fiat_p224_uint1 x169;
-  fiat_p224_addcarryx_u32(&x168, &x169, x167, 0x0, x148);
+  fiat_p224_addcarryx_u32(&x168, &x169, x167, x148, 0x0);
   uint32_t x170;
   fiat_p224_uint1 x171;
-  fiat_p224_addcarryx_u32(&x170, &x171, x169, 0x0, x150);
+  fiat_p224_addcarryx_u32(&x170, &x171, x169, x150, 0x0);
   uint32_t x172;
   fiat_p224_uint1 x173;
-  fiat_p224_addcarryx_u32(&x172, &x173, x171, 0x0, x152);
+  fiat_p224_addcarryx_u32(&x172, &x173, x171, x152, 0x0);
   uint32_t x174;
   fiat_p224_uint1 x175;
-  fiat_p224_addcarryx_u32(&x174, &x175, x173, 0x0, x154);
+  fiat_p224_addcarryx_u32(&x174, &x175, x173, x154, 0x0);
   uint32_t x176;
   fiat_p224_uint1 x177;
-  fiat_p224_addcarryx_u32(&x176, &x177, x175, 0x0, x162);
+  fiat_p224_addcarryx_u32(&x176, &x177, x175, x162, 0x0);
   uint32_t x178;
   uint32_t x179;
   fiat_p224_mulx_u32(&x178, &x179, x164, UINT32_C(0xffffffff));
@@ -2386,67 +2386,67 @@ static void fiat_p224_from_montgomery(uint32_t out1[7], const uint32_t arg1[7])
   fiat_p224_mulx_u32(&x186, &x187, x178, UINT32_C(0xffffffff));
   uint32_t x188;
   fiat_p224_uint1 x189;
-  fiat_p224_addcarryx_u32(&x188, &x189, 0x0, x184, x187);
+  fiat_p224_addcarryx_u32(&x188, &x189, 0x0, x187, x184);
   uint32_t x190;
   fiat_p224_uint1 x191;
-  fiat_p224_addcarryx_u32(&x190, &x191, x189, x182, x185);
+  fiat_p224_addcarryx_u32(&x190, &x191, x189, x185, x182);
   uint32_t x192;
   fiat_p224_uint1 x193;
-  fiat_p224_addcarryx_u32(&x192, &x193, x191, x180, x183);
+  fiat_p224_addcarryx_u32(&x192, &x193, x191, x183, x180);
   uint32_t x194;
   fiat_p224_uint1 x195;
-  fiat_p224_addcarryx_u32(&x194, &x195, 0x0, x178, x164);
+  fiat_p224_addcarryx_u32(&x194, &x195, 0x0, x164, x178);
   uint32_t x196;
   fiat_p224_uint1 x197;
-  fiat_p224_addcarryx_u32(&x196, &x197, x195, 0x0, x166);
+  fiat_p224_addcarryx_u32(&x196, &x197, x195, x166, 0x0);
   uint32_t x198;
   fiat_p224_uint1 x199;
-  fiat_p224_addcarryx_u32(&x198, &x199, x197, 0x0, x168);
+  fiat_p224_addcarryx_u32(&x198, &x199, x197, x168, 0x0);
   uint32_t x200;
   fiat_p224_uint1 x201;
-  fiat_p224_addcarryx_u32(&x200, &x201, x199, x186, x170);
+  fiat_p224_addcarryx_u32(&x200, &x201, x199, x170, x186);
   uint32_t x202;
   fiat_p224_uint1 x203;
-  fiat_p224_addcarryx_u32(&x202, &x203, x201, x188, x172);
+  fiat_p224_addcarryx_u32(&x202, &x203, x201, x172, x188);
   uint32_t x204;
   fiat_p224_uint1 x205;
-  fiat_p224_addcarryx_u32(&x204, &x205, x203, x190, x174);
+  fiat_p224_addcarryx_u32(&x204, &x205, x203, x174, x190);
   uint32_t x206;
   fiat_p224_uint1 x207;
-  fiat_p224_addcarryx_u32(&x206, &x207, x205, x192, x176);
+  fiat_p224_addcarryx_u32(&x206, &x207, x205, x176, x192);
   uint32_t x208;
   fiat_p224_uint1 x209;
-  fiat_p224_addcarryx_u32(&x208, &x209, x163, 0x0, 0x0);
+  fiat_p224_addcarryx_u32(&x208, &x209, x193, x181, 0x0);
   uint32_t x210;
   fiat_p224_uint1 x211;
-  fiat_p224_addcarryx_u32(&x210, &x211, x177, 0x0, (fiat_p224_uint1)x208);
+  fiat_p224_addcarryx_u32(&x210, &x211, x163, 0x0, 0x0);
   uint32_t x212;
   fiat_p224_uint1 x213;
-  fiat_p224_addcarryx_u32(&x212, &x213, x193, 0x0, x181);
+  fiat_p224_addcarryx_u32(&x212, &x213, x177, (fiat_p224_uint1)x210, 0x0);
   uint32_t x214;
   fiat_p224_uint1 x215;
-  fiat_p224_addcarryx_u32(&x214, &x215, x207, x212, x210);
+  fiat_p224_addcarryx_u32(&x214, &x215, x207, x212, x208);
   uint32_t x216;
   fiat_p224_uint1 x217;
-  fiat_p224_addcarryx_u32(&x216, &x217, 0x0, (arg1[5]), x196);
+  fiat_p224_addcarryx_u32(&x216, &x217, 0x0, x196, (arg1[5]));
   uint32_t x218;
   fiat_p224_uint1 x219;
-  fiat_p224_addcarryx_u32(&x218, &x219, x217, 0x0, x198);
+  fiat_p224_addcarryx_u32(&x218, &x219, x217, x198, 0x0);
   uint32_t x220;
   fiat_p224_uint1 x221;
-  fiat_p224_addcarryx_u32(&x220, &x221, x219, 0x0, x200);
+  fiat_p224_addcarryx_u32(&x220, &x221, x219, x200, 0x0);
   uint32_t x222;
   fiat_p224_uint1 x223;
-  fiat_p224_addcarryx_u32(&x222, &x223, x221, 0x0, x202);
+  fiat_p224_addcarryx_u32(&x222, &x223, x221, x202, 0x0);
   uint32_t x224;
   fiat_p224_uint1 x225;
-  fiat_p224_addcarryx_u32(&x224, &x225, x223, 0x0, x204);
+  fiat_p224_addcarryx_u32(&x224, &x225, x223, x204, 0x0);
   uint32_t x226;
   fiat_p224_uint1 x227;
-  fiat_p224_addcarryx_u32(&x226, &x227, x225, 0x0, x206);
+  fiat_p224_addcarryx_u32(&x226, &x227, x225, x206, 0x0);
   uint32_t x228;
   fiat_p224_uint1 x229;
-  fiat_p224_addcarryx_u32(&x228, &x229, x227, 0x0, x214);
+  fiat_p224_addcarryx_u32(&x228, &x229, x227, x214, 0x0);
   uint32_t x230;
   uint32_t x231;
   fiat_p224_mulx_u32(&x230, &x231, x216, UINT32_C(0xffffffff));
@@ -2464,67 +2464,67 @@ static void fiat_p224_from_montgomery(uint32_t out1[7], const uint32_t arg1[7])
   fiat_p224_mulx_u32(&x238, &x239, x230, UINT32_C(0xffffffff));
   uint32_t x240;
   fiat_p224_uint1 x241;
-  fiat_p224_addcarryx_u32(&x240, &x241, 0x0, x236, x239);
+  fiat_p224_addcarryx_u32(&x240, &x241, 0x0, x239, x236);
   uint32_t x242;
   fiat_p224_uint1 x243;
-  fiat_p224_addcarryx_u32(&x242, &x243, x241, x234, x237);
+  fiat_p224_addcarryx_u32(&x242, &x243, x241, x237, x234);
   uint32_t x244;
   fiat_p224_uint1 x245;
-  fiat_p224_addcarryx_u32(&x244, &x245, x243, x232, x235);
+  fiat_p224_addcarryx_u32(&x244, &x245, x243, x235, x232);
   uint32_t x246;
   fiat_p224_uint1 x247;
-  fiat_p224_addcarryx_u32(&x246, &x247, 0x0, x230, x216);
+  fiat_p224_addcarryx_u32(&x246, &x247, 0x0, x216, x230);
   uint32_t x248;
   fiat_p224_uint1 x249;
-  fiat_p224_addcarryx_u32(&x248, &x249, x247, 0x0, x218);
+  fiat_p224_addcarryx_u32(&x248, &x249, x247, x218, 0x0);
   uint32_t x250;
   fiat_p224_uint1 x251;
-  fiat_p224_addcarryx_u32(&x250, &x251, x249, 0x0, x220);
+  fiat_p224_addcarryx_u32(&x250, &x251, x249, x220, 0x0);
   uint32_t x252;
   fiat_p224_uint1 x253;
-  fiat_p224_addcarryx_u32(&x252, &x253, x251, x238, x222);
+  fiat_p224_addcarryx_u32(&x252, &x253, x251, x222, x238);
   uint32_t x254;
   fiat_p224_uint1 x255;
-  fiat_p224_addcarryx_u32(&x254, &x255, x253, x240, x224);
+  fiat_p224_addcarryx_u32(&x254, &x255, x253, x224, x240);
   uint32_t x256;
   fiat_p224_uint1 x257;
-  fiat_p224_addcarryx_u32(&x256, &x257, x255, x242, x226);
+  fiat_p224_addcarryx_u32(&x256, &x257, x255, x226, x242);
   uint32_t x258;
   fiat_p224_uint1 x259;
-  fiat_p224_addcarryx_u32(&x258, &x259, x257, x244, x228);
+  fiat_p224_addcarryx_u32(&x258, &x259, x257, x228, x244);
   uint32_t x260;
   fiat_p224_uint1 x261;
-  fiat_p224_addcarryx_u32(&x260, &x261, x215, 0x0, 0x0);
+  fiat_p224_addcarryx_u32(&x260, &x261, x245, x233, 0x0);
   uint32_t x262;
   fiat_p224_uint1 x263;
-  fiat_p224_addcarryx_u32(&x262, &x263, x229, 0x0, (fiat_p224_uint1)x260);
+  fiat_p224_addcarryx_u32(&x262, &x263, x215, 0x0, 0x0);
   uint32_t x264;
   fiat_p224_uint1 x265;
-  fiat_p224_addcarryx_u32(&x264, &x265, x245, 0x0, x233);
+  fiat_p224_addcarryx_u32(&x264, &x265, x229, (fiat_p224_uint1)x262, 0x0);
   uint32_t x266;
   fiat_p224_uint1 x267;
-  fiat_p224_addcarryx_u32(&x266, &x267, x259, x264, x262);
+  fiat_p224_addcarryx_u32(&x266, &x267, x259, x264, x260);
   uint32_t x268;
   fiat_p224_uint1 x269;
-  fiat_p224_addcarryx_u32(&x268, &x269, 0x0, (arg1[6]), x248);
+  fiat_p224_addcarryx_u32(&x268, &x269, 0x0, x248, (arg1[6]));
   uint32_t x270;
   fiat_p224_uint1 x271;
-  fiat_p224_addcarryx_u32(&x270, &x271, x269, 0x0, x250);
+  fiat_p224_addcarryx_u32(&x270, &x271, x269, x250, 0x0);
   uint32_t x272;
   fiat_p224_uint1 x273;
-  fiat_p224_addcarryx_u32(&x272, &x273, x271, 0x0, x252);
+  fiat_p224_addcarryx_u32(&x272, &x273, x271, x252, 0x0);
   uint32_t x274;
   fiat_p224_uint1 x275;
-  fiat_p224_addcarryx_u32(&x274, &x275, x273, 0x0, x254);
+  fiat_p224_addcarryx_u32(&x274, &x275, x273, x254, 0x0);
   uint32_t x276;
   fiat_p224_uint1 x277;
-  fiat_p224_addcarryx_u32(&x276, &x277, x275, 0x0, x256);
+  fiat_p224_addcarryx_u32(&x276, &x277, x275, x256, 0x0);
   uint32_t x278;
   fiat_p224_uint1 x279;
-  fiat_p224_addcarryx_u32(&x278, &x279, x277, 0x0, x258);
+  fiat_p224_addcarryx_u32(&x278, &x279, x277, x258, 0x0);
   uint32_t x280;
   fiat_p224_uint1 x281;
-  fiat_p224_addcarryx_u32(&x280, &x281, x279, 0x0, x266);
+  fiat_p224_addcarryx_u32(&x280, &x281, x279, x266, 0x0);
   uint32_t x282;
   uint32_t x283;
   fiat_p224_mulx_u32(&x282, &x283, x268, UINT32_C(0xffffffff));
@@ -2542,46 +2542,46 @@ static void fiat_p224_from_montgomery(uint32_t out1[7], const uint32_t arg1[7])
   fiat_p224_mulx_u32(&x290, &x291, x282, UINT32_C(0xffffffff));
   uint32_t x292;
   fiat_p224_uint1 x293;
-  fiat_p224_addcarryx_u32(&x292, &x293, 0x0, x288, x291);
+  fiat_p224_addcarryx_u32(&x292, &x293, 0x0, x291, x288);
   uint32_t x294;
   fiat_p224_uint1 x295;
-  fiat_p224_addcarryx_u32(&x294, &x295, x293, x286, x289);
+  fiat_p224_addcarryx_u32(&x294, &x295, x293, x289, x286);
   uint32_t x296;
   fiat_p224_uint1 x297;
-  fiat_p224_addcarryx_u32(&x296, &x297, x295, x284, x287);
+  fiat_p224_addcarryx_u32(&x296, &x297, x295, x287, x284);
   uint32_t x298;
   fiat_p224_uint1 x299;
-  fiat_p224_addcarryx_u32(&x298, &x299, 0x0, x282, x268);
+  fiat_p224_addcarryx_u32(&x298, &x299, 0x0, x268, x282);
   uint32_t x300;
   fiat_p224_uint1 x301;
-  fiat_p224_addcarryx_u32(&x300, &x301, x299, 0x0, x270);
+  fiat_p224_addcarryx_u32(&x300, &x301, x299, x270, 0x0);
   uint32_t x302;
   fiat_p224_uint1 x303;
-  fiat_p224_addcarryx_u32(&x302, &x303, x301, 0x0, x272);
+  fiat_p224_addcarryx_u32(&x302, &x303, x301, x272, 0x0);
   uint32_t x304;
   fiat_p224_uint1 x305;
-  fiat_p224_addcarryx_u32(&x304, &x305, x303, x290, x274);
+  fiat_p224_addcarryx_u32(&x304, &x305, x303, x274, x290);
   uint32_t x306;
   fiat_p224_uint1 x307;
-  fiat_p224_addcarryx_u32(&x306, &x307, x305, x292, x276);
+  fiat_p224_addcarryx_u32(&x306, &x307, x305, x276, x292);
   uint32_t x308;
   fiat_p224_uint1 x309;
-  fiat_p224_addcarryx_u32(&x308, &x309, x307, x294, x278);
+  fiat_p224_addcarryx_u32(&x308, &x309, x307, x278, x294);
   uint32_t x310;
   fiat_p224_uint1 x311;
-  fiat_p224_addcarryx_u32(&x310, &x311, x309, x296, x280);
+  fiat_p224_addcarryx_u32(&x310, &x311, x309, x280, x296);
   uint32_t x312;
   fiat_p224_uint1 x313;
-  fiat_p224_addcarryx_u32(&x312, &x313, x267, 0x0, 0x0);
+  fiat_p224_addcarryx_u32(&x312, &x313, x297, x285, 0x0);
   uint32_t x314;
   fiat_p224_uint1 x315;
-  fiat_p224_addcarryx_u32(&x314, &x315, x281, 0x0, (fiat_p224_uint1)x312);
+  fiat_p224_addcarryx_u32(&x314, &x315, x267, 0x0, 0x0);
   uint32_t x316;
   fiat_p224_uint1 x317;
-  fiat_p224_addcarryx_u32(&x316, &x317, x297, 0x0, x285);
+  fiat_p224_addcarryx_u32(&x316, &x317, x281, (fiat_p224_uint1)x314, 0x0);
   uint32_t x318;
   fiat_p224_uint1 x319;
-  fiat_p224_addcarryx_u32(&x318, &x319, x311, x316, x314);
+  fiat_p224_addcarryx_u32(&x318, &x319, x311, x316, x312);
   uint32_t x320;
   fiat_p224_uint1 x321;
   fiat_p224_subborrowx_u32(&x320, &x321, 0x0, x300, 0x1);