diff --git a/luamml-patches-amsmath.sty b/luamml-patches-amsmath.sty
index e62b6b6..c100ee5 100644
--- a/luamml-patches-amsmath.sty
+++ b/luamml-patches-amsmath.sty
@@ -302,72 +302,64 @@
        { \luamml_ignore: }
        { \__luamml_amsmath_original_mmeasure:n {#1} }
    }
- } % end package test
-
-
 % Luckily, {multline} uses \endmultline@math in exactly
 % the spot where we have to set the flag.
 % Less luckily, \endmultline@math sometimes get overwritten for the last line.
 % But that isn't a problem since we want special behavior there anyway.
-\cs_set:Npn \endmultline@math {
-  \UseTaggingSocket{math/luamml/save/nNn}{{} \displaystyle {mtd}}
-  $
-  \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
-}
-
-\cs_set:Npn \rendmultline@ {
-    \iftag@
+    \PackageInfo{luamml}{patching~\string\endmultline@math}
+    \cs_set:Npn \endmultline@math {
       \UseTaggingSocket{math/luamml/save/nNn}{{} \displaystyle {mtd}}
       $
       \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
-      \let \endmultline@math \relax
-      \ifshifttag@
-        \hskip \multlinegap
-        \llap {
-          \vtop {
-            \raise@tag
-            \normalbaselines
-            \setbox \@ne \null
-            \dp \@ne \lineht@
-            \box \@ne
-            \hbox {
-              \strut@
-              \make@display@tag
+    }
+    \PackageInfo{luamml}{patching~\string\rendmultline@}
+    \cs_set:Npn \rendmultline@ {
+        \iftag@
+          \UseTaggingSocket{math/luamml/save/nNn}{{} \displaystyle {mtd}}
+          $
+          \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
+          \let \endmultline@math \relax
+          \ifshifttag@
+            \hskip \multlinegap
+            \llap {
+              \vtop {
+                \raise@tag
+                \normalbaselines
+                \setbox \@ne \null
+                \dp \@ne \lineht@
+                \box \@ne
+                \hbox {
+                  \strut@
+                  \make@display@tag
+                }
+              }
             }
-          }
-        }
-      \else
-        \hskip \multlinetaggap
-        \make@display@tag
-      \fi
-      \UseTaggingSocket{math/luamml/mtable/tag/set}
-    \else
-      \hskip \multlinegap
-    \fi
-    \hfilneg
-    \math@cr
-    \UseExpandableTaggingSocket {math/luamml/mtable/finalize} {multline}
-  \egroup
-  $$
-}
-
-\cs_set:Npn \lendmultline@ {
-    \hfilneg
-    \hskip\multlinegap
-    \math@cr
-    \UseExpandableTaggingSocket {math/luamml/mtable/finalize} {multline}
-    %\__luamml_amsmath_finalize_table:n {multline}
-  \egroup
-  $$
-}
-
-% Finally some slightly different stuff.
-% While {matrix} is covered by {array}, we still have {smallmatrix}:
-
-\IfPackageAtLeastTF{latex-lab-testphase-math}{2025-01-24}
- {}
- { \PackageInfo{luamml}{patching~smallmatrix}
-
+          \else
+            \hskip \multlinetaggap
+            \make@display@tag
+          \fi
+          \UseTaggingSocket{math/luamml/mtable/tag/set}
+        \else
+          \hskip \multlinegap
+        \fi
+        \hfilneg
+        \math@cr
+        \UseExpandableTaggingSocket {math/luamml/mtable/finalize} {multline}
+      \egroup
+      $$
+    }
+    \PackageInfo{luamml}{patching~\string\lendmultline@}
+    \cs_set:Npn \lendmultline@ {
+        \hfilneg
+        \hskip\multlinegap
+        \math@cr
+        \UseExpandableTaggingSocket {math/luamml/mtable/finalize} {multline}
+        %\__luamml_amsmath_finalize_table:n {multline}
+      \egroup
+      $$
+    }
+   
+   \PackageInfo{luamml}{patching~smallmatrix}
     \renewenvironment {smallmatrix} {
       \UseTaggingSocket{ math/luamml/annotate/false } {} { \null\, }
       \vcenter \bgroup
@@ -409,7 +401,7 @@
       \UseTaggingSocket{math/luamml/mtable/innertable/finalize}
       \UseTaggingSocket{math/luamml/annotate/false} {}{ \, }
     }
-  }
+  } %end package test
 
 % {cases} is defined by the kernel, but we patch the overwritten version by amsmath.
 \cs_set:Npn \env@cases {