diff --git a/runtime/flang/mmul_cplx16contmxm.F95 b/runtime/flang/mmul_cplx16contmxm.F95
index 42a54e10d75..bd069522d35 100644
--- a/runtime/flang/mmul_cplx16contmxm.F95
+++ b/runtime/flang/mmul_cplx16contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_cplx16_contmxm(dest, src1, src2, k_extent,m_extent,n_extent)
 
-  COMPLEX*16, dimension(k_extent,m_extent) :: src1
-  COMPLEX*16, dimension(m_extent,n_extent) :: src2
-  COMPLEX*16, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  COMPLEX*16, dimension(k_extent,m_extent) :: src1
+  COMPLEX*16, dimension(m_extent,n_extent) :: src2
+  COMPLEX*16, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_cplx8contmxm.F95 b/runtime/flang/mmul_cplx8contmxm.F95
index 6101a24ab24..b62fa8da552 100644
--- a/runtime/flang/mmul_cplx8contmxm.F95
+++ b/runtime/flang/mmul_cplx8contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_cplx8_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  COMPLEX*8, dimension(k_extent,m_extent) :: src1
-  COMPLEX*8, dimension(m_extent,n_extent) :: src2
-  COMPLEX*8, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  COMPLEX*8, dimension(k_extent,m_extent) :: src1
+  COMPLEX*8, dimension(m_extent,n_extent) :: src2
+  COMPLEX*8, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_int1contmxm.F95 b/runtime/flang/mmul_int1contmxm.F95
index b867e29ae8d..a5bf35c5ada 100644
--- a/runtime/flang/mmul_int1contmxm.F95
+++ b/runtime/flang/mmul_int1contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_int1_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  INTEGER*1, dimension(k_extent,m_extent) :: src1
-  INTEGER*1, dimension(m_extent,n_extent) :: src2
-  INTEGER*1, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  INTEGER*1, dimension(k_extent,m_extent) :: src1
+  INTEGER*1, dimension(m_extent,n_extent) :: src2
+  INTEGER*1, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_int2contmxm.F95 b/runtime/flang/mmul_int2contmxm.F95
index 967e2e733e6..1e8758b9734 100644
--- a/runtime/flang/mmul_int2contmxm.F95
+++ b/runtime/flang/mmul_int2contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_int2_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  INTEGER*2, dimension(k_extent,m_extent):: src1
-  INTEGER*2, dimension(m_extent,n_extent) :: src2
-  INTEGER*2, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  INTEGER*2, dimension(k_extent,m_extent):: src1
+  INTEGER*2, dimension(m_extent,n_extent) :: src2
+  INTEGER*2, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_int4contmxm.F95 b/runtime/flang/mmul_int4contmxm.F95
index d3d422ce104..a3b88be67d8 100644
--- a/runtime/flang/mmul_int4contmxm.F95
+++ b/runtime/flang/mmul_int4contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_int4_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  INTEGER*4, dimension(k_extent,m_extent) :: src1
-  INTEGER*4, dimension(m_extent,n_extent) :: src2
-  INTEGER*4, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  INTEGER*4, dimension(k_extent,m_extent) :: src1
+  INTEGER*4, dimension(m_extent,n_extent) :: src2
+  INTEGER*4, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_int8contmxm.F95 b/runtime/flang/mmul_int8contmxm.F95
index 2b6071f5fa2..01bdc00dccb 100644
--- a/runtime/flang/mmul_int8contmxm.F95
+++ b/runtime/flang/mmul_int8contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_int8_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  INTEGER*8, dimension(k_extent,m_extent) :: src1
-  INTEGER*8, dimension(m_extent,n_extent) :: src2
-  INTEGER*8, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  INTEGER*8, dimension(k_extent,m_extent) :: src1
+  INTEGER*8, dimension(m_extent,n_extent) :: src2
+  INTEGER*8, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_log1contmxm.F95 b/runtime/flang/mmul_log1contmxm.F95
index 705d74bb4b2..f46e470e769 100644
--- a/runtime/flang/mmul_log1contmxm.F95
+++ b/runtime/flang/mmul_log1contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_log1_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  LOGICAL*1, dimension(k_extent,m_extent) :: src1
-  LOGICAL*1, dimension(m_extent,n_extent) :: src2
-  LOGICAL*1, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  LOGICAL*1, dimension(k_extent,m_extent) :: src1
+  LOGICAL*1, dimension(m_extent,n_extent) :: src2
+  LOGICAL*1, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_log2contmxm.F95 b/runtime/flang/mmul_log2contmxm.F95
index e4a83d79dda..eec80e65dcd 100644
--- a/runtime/flang/mmul_log2contmxm.F95
+++ b/runtime/flang/mmul_log2contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_log2_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  LOGICAL*2, dimension(k_extent,m_extent) :: src1
-  LOGICAL*2, dimension(m_extent,n_extent) :: src2
-  LOGICAL*2, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  LOGICAL*2, dimension(k_extent,m_extent) :: src1
+  LOGICAL*2, dimension(m_extent,n_extent) :: src2
+  LOGICAL*2, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_log4contmxm.F95 b/runtime/flang/mmul_log4contmxm.F95
index c43a19668e3..dffc0d5ec3f 100644
--- a/runtime/flang/mmul_log4contmxm.F95
+++ b/runtime/flang/mmul_log4contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_log4_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  LOGICAL*4, dimension(k_extent,m_extent) :: src1
-  LOGICAL*4, dimension(m_extent,n_extent) :: src2
-  LOGICAL*4, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  LOGICAL*4, dimension(k_extent,m_extent) :: src1
+  LOGICAL*4, dimension(m_extent,n_extent) :: src2
+  LOGICAL*4, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_log8contmxm.F95 b/runtime/flang/mmul_log8contmxm.F95
index b71fbaaf821..24ba20144cb 100644
--- a/runtime/flang/mmul_log8contmxm.F95
+++ b/runtime/flang/mmul_log8contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_log8_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  LOGICAL*8, dimension(k_extent,m_extent) :: src1
-  LOGICAL*8, dimension(m_extent,n_extent) :: src2
-  LOGICAL*8, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  LOGICAL*8, dimension(k_extent,m_extent) :: src1
+  LOGICAL*8, dimension(m_extent,n_extent) :: src2
+  LOGICAL*8, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_real16contmxm.F95 b/runtime/flang/mmul_real16contmxm.F95
index 49cabdbf9d9..7ba358b3ed1 100644
--- a/runtime/flang/mmul_real16contmxm.F95
+++ b/runtime/flang/mmul_real16contmxm.F95
@@ -8,12 +8,12 @@
 
 subroutine F90_matmul_real16_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  REAL*16, dimension(k_extent,m_extent) :: src1
-  REAL*16, dimension(m_extent,n_extent) :: src2
-  REAL*16, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  REAL*16, dimension(k_extent,m_extent) :: src1
+  REAL*16, dimension(m_extent,n_extent) :: src2
+  REAL*16, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_real4contmxm.F95 b/runtime/flang/mmul_real4contmxm.F95
index bdfa61a3dcb..dd14bcd1410 100644
--- a/runtime/flang/mmul_real4contmxm.F95
+++ b/runtime/flang/mmul_real4contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_real4_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  REAL*4, dimension(k_extent,m_extent) :: src1
-  REAL*4, dimension(m_extent,n_extent) :: src2
-  REAL*4, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  REAL*4, dimension(k_extent,m_extent) :: src1
+  REAL*4, dimension(m_extent,n_extent) :: src2
+  REAL*4, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n
diff --git a/runtime/flang/mmul_real8contmxm.F95 b/runtime/flang/mmul_real8contmxm.F95
index 7810fc8f954..68e04f2f834 100644
--- a/runtime/flang/mmul_real8contmxm.F95
+++ b/runtime/flang/mmul_real8contmxm.F95
@@ -9,12 +9,12 @@
 
 subroutine F90_matmul_real8_contmxm(dest, src1, src2, k_extent, m_extent, n_extent)
 
-  REAL*8, dimension(k_extent,m_extent) :: src1
-  REAL*8, dimension(m_extent,n_extent) :: src2
-  REAL*8, dimension(k_extent,n_extent) :: dest
   DESC_INT k_extent
   DESC_INT n_extent
   DESC_INT m_extent
+  REAL*8, dimension(k_extent,m_extent) :: src1
+  REAL*8, dimension(m_extent,n_extent) :: src2
+  REAL*8, dimension(k_extent,n_extent) :: dest
 
   DESC_INT k
   DESC_INT n