diff --git a/src/Timstat2.cc b/src/Timstat2.cc
index fc688dfe22c979872ebbd2ad52de314ce2cc7fc9..873933689e13ab8b7a9309cbe22a2a526a0afda7 100644
--- a/src/Timstat2.cc
+++ b/src/Timstat2.cc
@@ -99,11 +99,11 @@ correlation(size_t gridsize, double missval, const Varray<size_t> &nofvals, Varr
         {
           double dnvals = nvals;
           auto temp0 = MULM(work[0][i], work[1][i]);
-          auto temp1 = SUBM(work[4][i], DIVM(temp0, dnvals));
+          auto temp1 = SUBM(work[4][i], DIVX(temp0, dnvals));
           auto temp2 = MULM(work[0][i], work[0][i]);
           auto temp3 = MULM(work[1][i], work[1][i]);
-          auto temp4 = SUBM(work[2][i], DIVM(temp2, dnvals));
-          auto temp5 = SUBM(work[3][i], DIVM(temp3, dnvals));
+          auto temp4 = SUBM(work[2][i], DIVX(temp2, dnvals));
+          auto temp5 = SUBM(work[3][i], DIVX(temp3, dnvals));
           auto temp6 = MULM(temp4, temp5);
 
           cor = DIVM(temp1, SQRTM(temp6));
@@ -194,8 +194,8 @@ covariance(size_t gridsize, double missval, const Varray<size_t> &nofvals, Varra
       if (nvals > 0)
         {
           double dnvals = nvals;
-          auto temp = DIVM(MULM(work[0][i], work[1][i]), dnvals * dnvals);
-          covar = SUBM(DIVM(work[2][i], dnvals), temp);
+          auto temp = DIVX(MULM(work[0][i], work[1][i]), dnvals * dnvals);
+          covar = SUBM(DIVX(work[2][i], dnvals), temp);
           if (fp_is_equal(covar, missval)) numMissVals++;
         }
       else
diff --git a/src/Timstat3.cc b/src/Timstat3.cc
index 86e9543050f06a10cf27b379992a0e6afaba6a48..819978fae66862d8e7bfdbbbd2c3862c2b452048 100644
--- a/src/Timstat3.cc
+++ b/src/Timstat3.cc
@@ -29,8 +29,8 @@ varquot2test(double rconst, double risk, size_t gridsize, double missval, Varray
   auto missval2 = missval;
 
   auto varquot2test_kernel = [&](auto i, auto is_EQ) {
-    auto temp0 = DIVM(MULM(work[0][i], work[0][i]), work[2][i]);
-    auto temp1 = DIVM(MULM(work[3][i], work[3][i]), work[5][i]);
+    auto temp0 = DIVX(MULM(work[0][i], work[0][i]), work[2][i]);
+    auto temp1 = DIVX(MULM(work[3][i], work[3][i]), work[5][i]);
     auto temp2 = SUBM(work[1][i], temp0);
     auto temp3 = SUBM(work[4][i], temp1);
     auto statistic = DIVM(temp2, ADDM(temp2, MULM(rconst, temp3)));
@@ -64,23 +64,23 @@ meandiff2test(double rconst, double risk, size_t gridsize, double missval, Varra
   auto meandiff2test_kernel = [&](auto i, auto is_EQ) {
     double temp0 = 0.0;
     double degOfFreedom = -NIN;
-    auto tmp = DIVM(MULM(work[0][i], work[0][i]), work[2][i]);
-    temp0 = ADDM(temp0, DIVM(SUBM(work[1][i], tmp), varFactor[0]));
+    auto tmp = DIVX(MULM(work[0][i], work[0][i]), work[2][i]);
+    temp0 = ADDM(temp0, DIVX(SUBM(work[1][i], tmp), varFactor[0]));
     degOfFreedom = ADDM(degOfFreedom, work[2][i]);
-    tmp = DIVM(MULM(work[3][i], work[3][i]), work[5][i]);
-    temp0 = ADDM(temp0, DIVM(SUBM(work[4][i], tmp), varFactor[1]));
+    tmp = DIVX(MULM(work[3][i], work[3][i]), work[5][i]);
+    temp0 = ADDM(temp0, DIVX(SUBM(work[4][i], tmp), varFactor[1]));
     degOfFreedom = ADDM(degOfFreedom, work[5][i]);
 
     if (fp_is_not_equal(temp0, missval1) && temp0 < 0) temp0 = 0;  // This is possible because of rounding errors
 
-    auto stddevEstimator = SQRTM(DIVM(temp0, degOfFreedom));
+    auto stddevEstimator = SQRTM(DIVX(temp0, degOfFreedom));
     auto meanEstimator = -rconst;
-    meanEstimator = ADDM(meanEstimator, MULM(meanFactor[0], DIVM(work[0][i], work[2][i])));
-    meanEstimator = ADDM(meanEstimator, MULM(meanFactor[1], DIVM(work[3][i], work[5][i])));
+    meanEstimator = ADDM(meanEstimator, MULM(meanFactor[0], DIVX(work[0][i], work[2][i])));
+    meanEstimator = ADDM(meanEstimator, MULM(meanFactor[1], DIVX(work[3][i], work[5][i])));
 
     double temp1 = 0.0;
-    temp1 = ADDM(temp1, DIVM(factor1, work[2][i]));
-    temp1 = ADDM(temp1, DIVM(factor2, work[5][i]));
+    temp1 = ADDM(temp1, DIVX(factor1, work[2][i]));
+    temp1 = ADDM(temp1, DIVX(factor2, work[5][i]));
     auto norm = SQRTM(temp1);
 
     auto temp2 = DIVM(DIVM(meanEstimator, norm), stddevEstimator);
diff --git a/src/fieldc.cc b/src/fieldc.cc
index 6c9e8d093f38ab2540d30f343c1c334659aced28..9952191075001bcd80ddd1fbaa7cc746e11174bc 100644
--- a/src/fieldc.cc
+++ b/src/fieldc.cc
@@ -40,11 +40,11 @@ fieldc_div(Varray<T> &v, size_t len, size_t numMissVals, double missval, double
 {
   auto is_EQ = fp_is_equal;
   T missval1 = missval;
-  T missval2 = missval;
+  // T missval2 = missval;
 
   if (numMissVals || is_equal(rconst, 0))
     {
-      for (size_t i = 0; i < len; ++i) v[i] = DIVM(v[i], rconst);
+      for (size_t i = 0; i < len; ++i) v[i] = DIVX(v[i], rconst);
 
       if (is_equal(rconst, 0)) numMissVals = len;
     }