diff --git a/unpacked/extensions/TeX/AMSmath.js b/unpacked/extensions/TeX/AMSmath.js
index d0407798b..3d146b6a9 100644
--- a/unpacked/extensions/TeX/AMSmath.js
+++ b/unpacked/extensions/TeX/AMSmath.js
@@ -453,6 +453,15 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () {
       stack.global.tagged = !numbered && !stack.global.forcetag; // prevent automatic tagging in starred environments
     },
     EndEntry: function () {
+      for (var i = 0, m = this.data.length; i < m; i++) {
+        if (this.data[i] && this.data[i].type !== "mspace") {
+          if (this.data[i].isEmbellished()) {
+            var core = this.data[i].CoreMO();
+            core.form = MML.FORM.INFIX; core.lspace = 0;
+          }
+          break;
+        }
+      }
       var mtd = MML.mtd.apply(MML,this.data);
       if (this.data.shove) {mtd.columnalign = this.data.shove}
       this.row.push(mtd);
@@ -499,6 +508,21 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () {
       stack.global.notags = (taggable ? null : name);
       stack.global.tagged = !numbered && !stack.global.forcetag; // prevent automatic tagging in starred environments
     },
+    EndEntry: function () {
+      if (this.row.length > 0) {
+        for (var i = 0, m = this.data.length; i < m; i++) {
+          if (this.data[i] && this.data[i].type !== "mspace") {
+            if (this.data[i].isEmbellished()) {
+              var core = this.data[i].CoreMO();
+              core.form = MML.FORM.INFIX; core.lspace = 0;
+            }
+            break;
+          }
+        }
+      }
+      this.row.push(MML.mtd.apply(MML,this.data));
+      this.data = [];
+    },
     EndRow: function () {
       var mtr = MML.mtr;
       if (!this.global.tag && this.numbered) {this.autoTag()}
diff --git a/unpacked/extensions/toMathML.js b/unpacked/extensions/toMathML.js
index 20fb15a64..e26ea89c4 100644
--- a/unpacked/extensions/toMathML.js
+++ b/unpacked/extensions/toMathML.js
@@ -59,7 +59,7 @@ MathJax.Hub.Register.LoadHook("[MathJax]/jax/element/mml/jax.js",function () {
       if (!this.attrNames) {
         if (this.type === "mstyle") {defaults = MML.math.prototype.defaults}
         for (var id in defaults) {if (!skip[id] && defaults.hasOwnProperty(id)) {
-          var force = (id === "open" || id === "close");
+          var force = (id === "open" || id === "close" || id === "form");
           if (this[id] != null && (force || this[id] !== defaults[id])) {
             var value = this[id]; delete this[id];
             if (force || this.Get(id) !== value)