diff --git a/bn_mp_addmod.c b/bn_mp_addmod.c
index 2636e2a63..1dcfb678c 100644
--- a/bn_mp_addmod.c
+++ b/bn_mp_addmod.c
@@ -14,10 +14,11 @@ mp_err mp_addmod(const mp_int *a, const mp_int *b, const mp_int *c, mp_int *d)
    }
 
    if ((err = mp_add(a, b, &t)) != MP_OKAY) {
-      mp_clear(&t);
-      return err;
+      goto LBL_ERR;
    }
    err = mp_mod(&t, c, d);
+
+LBL_ERR:
    mp_clear(&t);
    return err;
 }
diff --git a/bn_mp_copy.c b/bn_mp_copy.c
index 141dd0e09..e72fcf6d5 100644
--- a/bn_mp_copy.c
+++ b/bn_mp_copy.c
@@ -7,6 +7,7 @@
 mp_err mp_copy(const mp_int *a, mp_int *b)
 {
    int n;
+   mp_digit *tmpa, *tmpb;
    mp_err err;
 
    /* if dst == src do nothing */
@@ -22,26 +23,22 @@ mp_err mp_copy(const mp_int *a, mp_int *b)
    }
 
    /* zero b and copy the parameters over */
-   {
-      mp_digit *tmpa, *tmpb;
+   /* pointer aliases */
 
-      /* pointer aliases */
+   /* source */
+   tmpa = a->dp;
 
-      /* source */
-      tmpa = a->dp;
+   /* destination */
+   tmpb = b->dp;
 
-      /* destination */
-      tmpb = b->dp;
-
-      /* copy all the digits */
-      for (n = 0; n < a->used; n++) {
-         *tmpb++ = *tmpa++;
-      }
-
-      /* clear high digits */
-      MP_ZERO_DIGITS(tmpb, b->used - n);
+   /* copy all the digits */
+   for (n = 0; n < a->used; n++) {
+      *tmpb++ = *tmpa++;
    }
 
+   /* clear high digits */
+   MP_ZERO_DIGITS(tmpb, b->used - n);
+
    /* copy used count and sign */
    b->used = a->used;
    b->sign = a->sign;
diff --git a/bn_mp_div_2.c b/bn_mp_div_2.c
index 2561e5aa2..f56ea8199 100644
--- a/bn_mp_div_2.c
+++ b/bn_mp_div_2.c
@@ -7,6 +7,7 @@
 mp_err mp_div_2(const mp_int *a, mp_int *b)
 {
    int     x, oldused;
+   mp_digit r, rr, *tmpa, *tmpb;
    mp_err err;
 
    /* copy */
@@ -18,31 +19,29 @@ mp_err mp_div_2(const mp_int *a, mp_int *b)
 
    oldused = b->used;
    b->used = a->used;
-   {
-      mp_digit r, rr, *tmpa, *tmpb;
 
-      /* source alias */
-      tmpa = a->dp + b->used - 1;
+   /* source alias */
+   tmpa = a->dp + b->used - 1;
 
-      /* dest alias */
-      tmpb = b->dp + b->used - 1;
+   /* dest alias */
+   tmpb = b->dp + b->used - 1;
 
-      /* carry */
-      r = 0;
-      for (x = b->used - 1; x >= 0; x--) {
-         /* get the carry for the next iteration */
-         rr = *tmpa & 1u;
+   /* carry */
+   r = 0;
+   for (x = b->used - 1; x >= 0; x--) {
+      /* get the carry for the next iteration */
+      rr = *tmpa & 1u;
 
-         /* shift the current digit, add in carry and store */
-         *tmpb-- = (*tmpa-- >> 1) | (r << (MP_DIGIT_BIT - 1));
+      /* shift the current digit, add in carry and store */
+      *tmpb-- = (*tmpa-- >> 1) | (r << (MP_DIGIT_BIT - 1));
 
-         /* forward carry to next iteration */
-         r = rr;
-      }
-
-      /* zero excess digits */
-      MP_ZERO_DIGITS(b->dp + b->used, oldused - b->used);
+      /* forward carry to next iteration */
+      r = rr;
    }
+
+   /* zero excess digits */
+   MP_ZERO_DIGITS(b->dp + b->used, oldused - b->used);
+
    b->sign = a->sign;
    mp_clamp(b);
    return MP_OKAY;
diff --git a/bn_mp_export.c b/bn_mp_export.c
index c9de48b80..9dea54eb1 100644
--- a/bn_mp_export.c
+++ b/bn_mp_export.c
@@ -53,19 +53,19 @@ mp_err mp_export(void *rop, size_t *countp, int order, size_t size,
          *byte = (unsigned char)((j == ((size - nail_bytes) - 1u)) ? (t.dp[0] & odd_nail_mask) : (t.dp[0] & 0xFFuL));
 
          if ((err = mp_div_2d(&t, (j == ((size - nail_bytes) - 1u)) ? (int)(8u - odd_nails) : 8, &t, NULL)) != MP_OKAY) {
-            mp_clear(&t);
-            return err;
+            goto LBL_ERR;
          }
       }
    }
 
-   mp_clear(&t);
-
    if (countp != NULL) {
       *countp = count;
    }
+   err = MP_OKAY;
 
-   return MP_OKAY;
+LBL_ERR:
+   mp_clear(&t);
+   return err;
 }
 
 #endif
diff --git a/bn_mp_expt_u32.c b/bn_mp_expt_u32.c
index 4ec725ea8..2ab67ba53 100644
--- a/bn_mp_expt_u32.c
+++ b/bn_mp_expt_u32.c
@@ -21,16 +21,14 @@ mp_err mp_expt_u32(const mp_int *a, uint32_t b, mp_int *c)
       /* if the bit is set multiply */
       if ((b & 1u) != 0u) {
          if ((err = mp_mul(c, &g, c)) != MP_OKAY) {
-            mp_clear(&g);
-            return err;
+            goto LBL_ERR;
          }
       }
 
       /* square */
       if (b > 1u) {
          if ((err = mp_sqr(&g, &g)) != MP_OKAY) {
-            mp_clear(&g);
-            return err;
+            goto LBL_ERR;
          }
       }
 
@@ -38,8 +36,11 @@ mp_err mp_expt_u32(const mp_int *a, uint32_t b, mp_int *c)
       b >>= 1;
    }
 
+   err = MP_OKAY;
+
+LBL_ERR:
    mp_clear(&g);
-   return MP_OKAY;
+   return err;
 }
 
 #endif
diff --git a/bn_mp_exptmod.c b/bn_mp_exptmod.c
index f6846ccea..bc4b64313 100644
--- a/bn_mp_exptmod.c
+++ b/bn_mp_exptmod.c
@@ -26,27 +26,23 @@ mp_err mp_exptmod(const mp_int *G, const mp_int *X, const mp_int *P, mp_int *Y)
          return MP_VAL;
       }
 
-      /* first compute 1/G mod P */
-      if ((err = mp_init(&tmpG)) != MP_OKAY) {
+      if ((err = mp_init_multi(&tmpG, &tmpX, NULL)) != MP_OKAY) {
          return err;
       }
+
+      /* first compute 1/G mod P */
       if ((err = mp_invmod(G, P, &tmpG)) != MP_OKAY) {
-         mp_clear(&tmpG);
-         return err;
+         goto LBL_ERR;
       }
 
       /* now get |X| */
-      if ((err = mp_init(&tmpX)) != MP_OKAY) {
-         mp_clear(&tmpG);
-         return err;
-      }
       if ((err = mp_abs(X, &tmpX)) != MP_OKAY) {
-         mp_clear_multi(&tmpG, &tmpX, NULL);
-         return err;
+         goto LBL_ERR;
       }
 
       /* and now compute (1/G)**|X| instead of G**X [X < 0] */
       err = mp_exptmod(&tmpG, &tmpX, P, Y);
+LBL_ERR:
       mp_clear_multi(&tmpG, &tmpX, NULL);
       return err;
    }
diff --git a/bn_mp_fwrite.c b/bn_mp_fwrite.c
index 5b4719fe4..eaa5d06a9 100644
--- a/bn_mp_fwrite.c
+++ b/bn_mp_fwrite.c
@@ -20,17 +20,18 @@ mp_err mp_fwrite(const mp_int *a, int radix, FILE *stream)
    }
 
    if ((err = mp_to_radix(a, buf, (size_t)len, radix)) != MP_OKAY) {
-      MP_FREE_BUFFER(buf, (size_t)len);
-      return err;
+      goto LBL_ERR;
    }
 
    if (fwrite(buf, (size_t)len, 1uL, stream) != 1uL) {
-      MP_FREE_BUFFER(buf, (size_t)len);
-      return MP_ERR;
+      err = MP_ERR;
+      goto LBL_ERR;
    }
+   err = MP_OKAY;
 
+LBL_ERR:
    MP_FREE_BUFFER(buf, (size_t)len);
-   return MP_OKAY;
+   return err;
 }
 #endif
 
diff --git a/bn_mp_mod.c b/bn_mp_mod.c
index 18b4e6ba3..8fbfe08dc 100644
--- a/bn_mp_mod.c
+++ b/bn_mp_mod.c
@@ -14,8 +14,7 @@ mp_err mp_mod(const mp_int *a, const mp_int *b, mp_int *c)
    }
 
    if ((err = mp_div(a, b, NULL, &t)) != MP_OKAY) {
-      mp_clear(&t);
-      return err;
+      goto LBL_ERR;
    }
 
    if (MP_IS_ZERO(&t) || (t.sign == b->sign)) {
@@ -25,6 +24,7 @@ mp_err mp_mod(const mp_int *a, const mp_int *b, mp_int *c)
       err = mp_add(b, &t, c);
    }
 
+LBL_ERR:
    mp_clear(&t);
    return err;
 }
diff --git a/bn_mp_mulmod.c b/bn_mp_mulmod.c
index 763f923b1..160d1626a 100644
--- a/bn_mp_mulmod.c
+++ b/bn_mp_mulmod.c
@@ -14,10 +14,11 @@ mp_err mp_mulmod(const mp_int *a, const mp_int *b, const mp_int *c, mp_int *d)
    }
 
    if ((err = mp_mul(a, b, &t)) != MP_OKAY) {
-      mp_clear(&t);
-      return err;
+      goto LBL_ERR;
    }
    err = mp_mod(&t, c, d);
+
+LBL_ERR:
    mp_clear(&t);
    return err;
 }
diff --git a/bn_mp_radix_size.c b/bn_mp_radix_size.c
index 6d7f912a0..339b21bca 100644
--- a/bn_mp_radix_size.c
+++ b/bn_mp_radix_size.c
@@ -48,16 +48,18 @@ mp_err mp_radix_size(const mp_int *a, int radix, int *size)
    /* fetch out all of the digits */
    while (!MP_IS_ZERO(&t)) {
       if ((err = mp_div_d(&t, (mp_digit)radix, &t, &d)) != MP_OKAY) {
-         mp_clear(&t);
-         return err;
+         goto LBL_ERR;
       }
       ++digs;
    }
-   mp_clear(&t);
 
    /* return digs + 1, the 1 is for the NULL byte that would be required. */
    *size = digs + 1;
-   return MP_OKAY;
+   err = MP_OKAY;
+
+LBL_ERR:
+   mp_clear(&t);
+   return err;
 }
 
 #endif
diff --git a/bn_mp_sqrmod.c b/bn_mp_sqrmod.c
index b3c44e5cb..626ea2c29 100644
--- a/bn_mp_sqrmod.c
+++ b/bn_mp_sqrmod.c
@@ -14,10 +14,11 @@ mp_err mp_sqrmod(const mp_int *a, const mp_int *b, mp_int *c)
    }
 
    if ((err = mp_sqr(a, &t)) != MP_OKAY) {
-      mp_clear(&t);
-      return err;
+      goto LBL_ERR;
    }
    err = mp_mod(&t, b, c);
+
+LBL_ERR:
    mp_clear(&t);
    return err;
 }
diff --git a/bn_mp_sqrtmod_prime.c b/bn_mp_sqrtmod_prime.c
index f80376059..a833ed7c1 100644
--- a/bn_mp_sqrtmod_prime.c
+++ b/bn_mp_sqrtmod_prime.c
@@ -61,7 +61,7 @@ mp_err mp_sqrtmod_prime(const mp_int *n, const mp_int *prime, mp_int *ret)
    /* find a Z such that the Legendre symbol (Z|prime) == -1 */
    mp_set_u32(&Z, 2u);
    /* Z = 2 */
-   while (1) {
+   for (;;) {
       if ((err = mp_kronecker(&Z, prime, &legendre)) != MP_OKAY)     goto cleanup;
       if (legendre == -1) break;
       if ((err = mp_add_d(&Z, 1uL, &Z)) != MP_OKAY)               goto cleanup;
@@ -81,10 +81,10 @@ mp_err mp_sqrtmod_prime(const mp_int *n, const mp_int *prime, mp_int *ret)
    /* M = S */
    mp_set_u32(&two, 2u);
 
-   while (1) {
+   for (;;) {
       if ((err = mp_copy(&T, &t1)) != MP_OKAY)                    goto cleanup;
       i = 0;
-      while (1) {
+      for (;;) {
          if (mp_cmp_d(&t1, 1uL) == MP_EQ) break;
          if ((err = mp_exptmod(&t1, &two, prime, &t1)) != MP_OKAY) goto cleanup;
          i++;
diff --git a/bn_mp_submod.c b/bn_mp_submod.c
index 61c2d0f95..5ebd37498 100644
--- a/bn_mp_submod.c
+++ b/bn_mp_submod.c
@@ -14,10 +14,11 @@ mp_err mp_submod(const mp_int *a, const mp_int *b, const mp_int *c, mp_int *d)
    }
 
    if ((err = mp_sub(a, b, &t)) != MP_OKAY) {
-      mp_clear(&t);
-      return err;
+      goto LBL_ERR;
    }
    err = mp_mod(&t, c, d);
+
+LBL_ERR:
    mp_clear(&t);
    return err;
 }
diff --git a/bn_mp_to_radix.c b/bn_mp_to_radix.c
index c75ee5b04..d6e8fcc3a 100644
--- a/bn_mp_to_radix.c
+++ b/bn_mp_to_radix.c
@@ -52,8 +52,7 @@ mp_err mp_to_radix(const mp_int *a, char *str, size_t maxlen, int radix)
          break;
       }
       if ((err = mp_div_d(&t, (mp_digit)radix, &t, &d)) != MP_OKAY) {
-         mp_clear(&t);
-         return err;
+         goto LBL_ERR;
       }
       *str++ = mp_s_rmap[d];
       ++digs;
@@ -67,6 +66,9 @@ mp_err mp_to_radix(const mp_int *a, char *str, size_t maxlen, int radix)
    /* append a NULL so the string is properly terminated */
    *str = '\0';
 
+   err = MP_OKAY;
+
+LBL_ERR:
    mp_clear(&t);
    return err;
 }
diff --git a/bn_mp_to_unsigned_bin.c b/bn_mp_to_unsigned_bin.c
index 093b01aa1..bc6372c75 100644
--- a/bn_mp_to_unsigned_bin.c
+++ b/bn_mp_to_unsigned_bin.c
@@ -22,12 +22,14 @@ mp_err mp_to_unsigned_bin(const mp_int *a, unsigned char *b)
       b[x++] = (unsigned char)(t.dp[0] | ((t.dp[1] & 1u) << 7));
 #endif
       if ((err = mp_div_2d(&t, 8, &t, NULL)) != MP_OKAY) {
-         mp_clear(&t);
-         return err;
+         goto LBL_ERR;
       }
    }
    s_mp_reverse(b, x);
+   err = MP_OKAY;
+
+LBL_ERR:
    mp_clear(&t);
-   return MP_OKAY;
+   return err;
 }
 #endif
diff --git a/bn_s_mp_toom_mul.c b/bn_s_mp_toom_mul.c
index ce47f250a..e68eff1a0 100644
--- a/bn_s_mp_toom_mul.c
+++ b/bn_s_mp_toom_mul.c
@@ -44,7 +44,7 @@ mp_err s_mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c)
 
    /** a = a2 * x^2 + a1 * x + a0; */
    if ((err = mp_init_size(&a0, B)) != MP_OKAY) {
-      goto LTM_ERRa0;
+      goto LBL_ERRa0;
    }
    for (count = 0; count < B; count++) {
       a0.dp[count] = a->dp[count];
@@ -52,7 +52,7 @@ mp_err s_mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c)
    }
    mp_clamp(&a0);
    if ((err = mp_init_size(&a1, B)) != MP_OKAY) {
-      goto LTM_ERRa1;
+      goto LBL_ERRa1;
    }
    for (; count < (2 * B); count++) {
       a1.dp[count - B] = a->dp[count];
@@ -60,7 +60,7 @@ mp_err s_mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c)
    }
    mp_clamp(&a1);
    if ((err = mp_init_size(&a2, B + (a->used - (3 * B)))) != MP_OKAY) {
-      goto LTM_ERRa2;
+      goto LBL_ERRa2;
    }
    for (; count < a->used; count++) {
       a2.dp[count - (2 * B)] = a->dp[count];
@@ -69,7 +69,7 @@ mp_err s_mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c)
 
    /** b = b2 * x^2 + b1 * x + b0; */
    if ((err = mp_init_size(&b0, B)) != MP_OKAY) {
-      goto LTM_ERRb0;
+      goto LBL_ERRb0;
    }
    for (count = 0; count < B; count++) {
       b0.dp[count] = b->dp[count];
@@ -77,7 +77,7 @@ mp_err s_mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c)
    }
    mp_clamp(&b0);
    if ((err = mp_init_size(&b1, B)) != MP_OKAY) {
-      goto LTM_ERRb1;
+      goto LBL_ERRb1;
    }
    for (; count < (2 * B); count++) {
       b1.dp[count - B] = b->dp[count];
@@ -85,7 +85,7 @@ mp_err s_mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c)
    }
    mp_clamp(&b1);
    if ((err = mp_init_size(&b2, B + (b->used - (3 * B)))) != MP_OKAY) {
-      goto LTM_ERRb2;
+      goto LBL_ERRb2;
    }
    for (; count < b->used; count++) {
       b2.dp[count - (2 * B)] = b->dp[count];
@@ -95,174 +95,174 @@ mp_err s_mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c)
    /** \\ S1 = (a2+a1+a0) * (b2+b1+b0); */
    /** T1 = a2 + a1; */
    if ((err = mp_add(&a2, &a1, &T1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** S2 = T1 + a0; */
    if ((err = mp_add(&T1, &a0, &S2)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** c = b2 + b1; */
    if ((err = mp_add(&b2, &b1, c)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** S1 = c + b0; */
    if ((err = mp_add(c, &b0, &S1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** S1 = S1 * S2; */
    if ((err = mp_mul(&S1, &S2, &S1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\S2 = (4*a2+2*a1+a0) * (4*b2+2*b1+b0); */
    /** T1 = T1 + a2; */
    if ((err = mp_add(&T1, &a2, &T1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** T1 = T1 << 1; */
    if ((err = mp_mul_2(&T1, &T1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** T1 = T1 + a0; */
    if ((err = mp_add(&T1, &a0, &T1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** c = c + b2; */
    if ((err = mp_add(c, &b2, c)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** c = c << 1; */
    if ((err = mp_mul_2(c, c)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** c = c + b0; */
    if ((err = mp_add(c, &b0, c)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** S2 = T1 * c; */
    if ((err = mp_mul(&T1, c, &S2)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\S3 = (a2-a1+a0) * (b2-b1+b0); */
    /** a1 = a2 - a1; */
    if ((err = mp_sub(&a2, &a1, &a1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** a1 = a1 + a0; */
    if ((err = mp_add(&a1, &a0, &a1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** b1 = b2 - b1; */
    if ((err = mp_sub(&b2, &b1, &b1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** b1 = b1 + b0; */
    if ((err = mp_add(&b1, &b0, &b1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** a1 = a1 * b1; */
    if ((err = mp_mul(&a1, &b1, &a1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** b1 = a2 * b2; */
    if ((err = mp_mul(&a2, &b2, &b1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\S2 = (S2 - S3)/3; */
    /** S2 = S2 - a1; */
    if ((err = mp_sub(&S2, &a1, &S2)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** S2 = S2 / 3; \\ this is an exact division  */
    if ((err = mp_div_3(&S2, &S2, NULL)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** a1 = S1 - a1; */
    if ((err = mp_sub(&S1, &a1, &a1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** a1 = a1 >> 1; */
    if ((err = mp_div_2(&a1, &a1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** a0 = a0 * b0; */
    if ((err = mp_mul(&a0, &b0, &a0)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** S1 = S1 - a0; */
    if ((err = mp_sub(&S1, &a0, &S1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** S2 = S2 - S1; */
    if ((err = mp_sub(&S2, &S1, &S2)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** S2 = S2 >> 1; */
    if ((err = mp_div_2(&S2, &S2)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** S1 = S1 - a1; */
    if ((err = mp_sub(&S1, &a1, &S1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** S1 = S1 - b1; */
    if ((err = mp_sub(&S1, &b1, &S1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** T1 = b1 << 1; */
    if ((err = mp_mul_2(&b1, &T1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** S2 = S2 - T1; */
    if ((err = mp_sub(&S2, &T1, &S2)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** a1 = a1 - S2; */
    if ((err = mp_sub(&a1, &S2, &a1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
 
    /** P = b1*x^4+ S2*x^3+ S1*x^2+ a1*x + a0; */
    if ((err = mp_lshd(&b1, 4 * B)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_lshd(&S2, 3 * B)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_add(&b1, &S2, &b1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_lshd(&S1, 2 * B)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_add(&b1, &S1, &b1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_lshd(&a1, 1 * B)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_add(&b1, &a1, &b1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_add(&b1, &a0, c)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
 
    /** a * b - P */
 
 
-LTM_ERR:
+LBL_ERR:
    mp_clear(&b2);
-LTM_ERRb2:
+LBL_ERRb2:
    mp_clear(&b1);
-LTM_ERRb1:
+LBL_ERRb1:
    mp_clear(&b0);
-LTM_ERRb0:
+LBL_ERRb0:
    mp_clear(&a2);
-LTM_ERRa2:
+LBL_ERRa2:
    mp_clear(&a1);
-LTM_ERRa1:
+LBL_ERRa1:
    mp_clear(&a0);
-LTM_ERRa0:
+LBL_ERRa0:
    mp_clear_multi(&S1, &S2, &T1, NULL);
    return err;
 }
diff --git a/bn_s_mp_toom_sqr.c b/bn_s_mp_toom_sqr.c
index a6bf85e99..5cd0de30a 100644
--- a/bn_s_mp_toom_sqr.c
+++ b/bn_s_mp_toom_sqr.c
@@ -35,15 +35,15 @@ mp_err s_mp_toom_sqr(const mp_int *a, mp_int *b)
 
    /** a = a2 * x^2 + a1 * x + a0; */
    if ((err = mp_init_size(&a0, B)) != MP_OKAY) {
-      goto LTM_ERRa0;
+      goto LBL_ERRa0;
    }
    a0.used = B;
    if ((err = mp_init_size(&a1, B)) != MP_OKAY) {
-      goto LTM_ERRa1;
+      goto LBL_ERRa1;
    }
    a1.used = B;
    if ((err = mp_init_size(&a2, B + (a->used - (3 * B)))) != MP_OKAY) {
-      goto LTM_ERRa2;
+      goto LBL_ERRa2;
    }
    tmpa = a->dp;
    tmpc = a0.dp;
@@ -64,88 +64,88 @@ mp_err s_mp_toom_sqr(const mp_int *a, mp_int *b)
 
    /** S0 = a0^2;  */
    if ((err = mp_sqr(&a0, &S0)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\S1 = (a2 + a1 + a0)^2 */
    /** \\S2 = (a2 - a1 + a0)^2  */
    /** \\S1 = a0 + a2; */
    /** a0 = a0 + a2; */
    if ((err = mp_add(&a0, &a2, &a0)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\S2 = S1 - a1; */
    /** b = a0 - a1; */
    if ((err = mp_sub(&a0, &a1, b)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\S1 = S1 + a1; */
    /** a0 = a0 + a1; */
    if ((err = mp_add(&a0, &a1, &a0)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\S1 = S1^2;  */
    /** a0 = a0^2; */
    if ((err = mp_sqr(&a0, &a0)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\S2 = S2^2;  */
    /** b = b^2; */
    if ((err = mp_sqr(b, b)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
 
    /** \\ S3 = 2 * a1 * a2  */
    /** \\S3 = a1 * a2;  */
    /** a1 = a1 * a2; */
    if ((err = mp_mul(&a1, &a2, &a1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\S3 = S3 << 1;  */
    /** a1 = a1 << 1; */
    if ((err = mp_mul_2(&a1, &a1)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
 
    /** \\S4 = a2^2;  */
    /** a2 = a2^2; */
    if ((err = mp_sqr(&a2, &a2)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
 
    /** \\ tmp = (S1 + S2)/2  */
    /** \\tmp = S1 + S2; */
    /** b = a0 + b; */
    if ((err = mp_add(&a0, b, b)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\tmp = tmp >> 1; */
    /** b = b >> 1; */
    if ((err = mp_div_2(b, b)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
 
    /** \\ S1 = S1 - tmp - S3  */
    /** \\S1 = S1 - tmp; */
    /** a0 = a0 - b; */
    if ((err = mp_sub(&a0, b, &a0)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\S1 = S1 - S3;  */
    /** a0 = a0 - a1; */
    if ((err = mp_sub(&a0, &a1, &a0)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
 
    /** \\S2 = tmp - S4 -S0  */
    /** \\S2 = tmp - S4;  */
    /** b = b - a2; */
    if ((err = mp_sub(b, &a2, b)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** \\S2 = S2 - S0;  */
    /** b = b - S0; */
    if ((err = mp_sub(b, &S0, b)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
 
 
@@ -153,39 +153,39 @@ mp_err s_mp_toom_sqr(const mp_int *a, mp_int *b)
    /** P = a2*x^4 + a1*x^3 + b*x^2 + a0*x + S0; */
 
    if ((err = mp_lshd(&a2, 4 * B)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_lshd(&a1, 3 * B)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_lshd(b, 2 * B)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_lshd(&a0, 1 * B)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_add(&a2, &a1, &a2)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_add(&a2, b, b)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_add(b, &a0, b)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    if ((err = mp_add(b, &S0, b)) != MP_OKAY) {
-      goto LTM_ERR;
+      goto LBL_ERR;
    }
    /** a^2 - P  */
 
 
-LTM_ERR:
+LBL_ERR:
    mp_clear(&a2);
-LTM_ERRa2:
+LBL_ERRa2:
    mp_clear(&a1);
-LTM_ERRa1:
+LBL_ERRa1:
    mp_clear(&a0);
-LTM_ERRa0:
+LBL_ERRa0:
    mp_clear(&S0);
 
    return err;
diff --git a/tommath_class.h b/tommath_class.h
index 1bd0c0b93..24122d140 100644
--- a/tommath_class.h
+++ b/tommath_class.h
@@ -405,10 +405,9 @@
 
 #if defined(BN_MP_EXPTMOD_C)
 #   define BN_MP_ABS_C
-#   define BN_MP_CLEAR_C
 #   define BN_MP_CLEAR_MULTI_C
 #   define BN_MP_DR_IS_MODULUS_C
-#   define BN_MP_INIT_C
+#   define BN_MP_INIT_MULTI_C
 #   define BN_MP_INVMOD_C
 #   define BN_MP_REDUCE_IS_2K_C
 #   define BN_MP_REDUCE_IS_2K_L_C