diff --git a/lib/LaTeXML/Package/TeX.pool.ltxml b/lib/LaTeXML/Package/TeX.pool.ltxml
index dbc9308fd..d9019fb2b 100644
--- a/lib/LaTeXML/Package/TeX.pool.ltxml
+++ b/lib/LaTeXML/Package/TeX.pool.ltxml
@@ -4531,6 +4531,35 @@ DefMacroI('\active@math@prime', undef, sub {
 AssignMathcode("'" => 0x8000);
 Let("'", '\active@math@prime');
 
+# Experiment: When we detect a math element containing solely a floating superscript in the
+#             *Frontmatter* of a document, assume it is a note mark, and normalize it down to
+#             plain text.
+DefRewrite(xpath => 'descendant::ltx:Math[child::ltx:XMath[child::ltx:XMApp[' .
+    '(@role="FLOATSUPERSCRIPT" or @role="FLOATSUBSCRIPT") and ' .
+    'not(preceding-sibling::*) and not(following-sibling::*) ' .
+    'and not(./*/*[not(self::ltx:XMTok)]) ]]]',
+  replace => sub {
+    my ($document, $math) = @_;
+    # We can assume the grandchild of the XMath node is the XMArg,
+    # which we need to normalize to scripted Unicode.
+    if (my @xmath = element_nodes($math)) {
+      if (my @xmapp = element_nodes($xmath[0])) {
+        if (my @xmarg = element_nodes($xmapp[0])) {
+          if (my $role = $xmapp[0]->getAttribute('role')) {
+            my $text = $xmarg[0]->textContent;
+            local $LaTeXML::BOX = $document->getNodeBox($xmarg[0]);
+            if ($role eq 'FLOATSUPERSCRIPT') {
+              $document->insertElement('ltx:sup', $text);
+              return; }
+            elsif ($role eq 'FLOATSUBSCRIPT') {
+              $document->insertElement('ltx:sub', $text);
+              return; }
+    } } } }
+    # should never happen, but just in case:
+    Info("rewrite", "footnotemark", "Failed to find floating node in: " . $math->toString(1));
+    $document->getNode->appendChild($math);
+    return; });
+
 #======================================================================
 # \choose & friends, also need VERY special argument handling
 
diff --git a/t/ams/amsdisplay.xml b/t/ams/amsdisplay.xml
index 09bd9884d..7b10fff78 100644
--- a/t/ams/amsdisplay.xml
+++ b/t/ams/amsdisplay.xml
@@ -945,20 +945,8 @@
       </equation>
       <equation xml:id="S0.E15.x3">
         <tags>
-          <tag>(15a<Math mode="inline" tex="{}^{\prime}" text="^prime" xml:id="S0.E15.x3.m1">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime" role="SUPOP">′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math>)</tag>
-          <tag role="refnum">15a<Math mode="inline" tex="{}^{\prime}" text="^prime" xml:id="S0.E15.x3.m2">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime" role="SUPOP">′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math></tag>
+          <tag>(15a<sup><text font="italic">′</text></sup>)</tag>
+          <tag role="refnum">15a<sup><text font="italic">′</text></sup></tag>
         </tags>
         <Math mode="display" tex="N=15a" text="N = 15 * a" xml:id="S0.E15.x3.m3">
           <XMath>
@@ -976,20 +964,8 @@
       </equation>
       <equation xml:id="S0.E15.x4">
         <tags>
-          <tag>(15a<Math mode="inline" tex="{}^{\prime\prime}" text="^prime2" xml:id="S0.E15.x4.m1">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime2" role="SUPOP">′′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math>)</tag>
-          <tag role="refnum">15a<Math mode="inline" tex="{}^{\prime\prime}" text="^prime2" xml:id="S0.E15.x4.m2">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime2" role="SUPOP">′′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math></tag>
+          <tag>(15a<sup><text font="italic">′′</text></sup>)</tag>
+          <tag role="refnum">15a<sup><text font="italic">′′</text></sup></tag>
         </tags>
         <Math mode="display" tex="N=15b" text="N = 15 * b" xml:id="S0.E15.x4.m3">
           <XMath>
diff --git a/t/ams/mathtools.xml b/t/ams/mathtools.xml
index 123414ab5..836594071 100644
--- a/t/ams/mathtools.xml
+++ b/t/ams/mathtools.xml
@@ -945,20 +945,8 @@ In the star form <verbatim font="typewriter upright">\ref*</verbatim> becomes <r
       <p>Non-textual</p>
       <equation labels="LABEL:eq:nt1" xml:id="S2.Ex13">
         <tags>
-          <tag>(n<Math mode="inline" tex="{}^{\mathit{th}}" text="^th" xml:id="S2.Ex13.m1">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok font="italic" fontsize="70%" role="UNKNOWN">th</XMTok>
-                </XMApp>
-              </XMath>
-            </Math>)</tag>
-          <tag role="refnum">n<Math mode="inline" tex="{}^{\mathit{th}}" text="^th" xml:id="S2.Ex13.m2">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok font="italic" fontsize="70%" role="UNKNOWN">th</XMTok>
-                </XMApp>
-              </XMath>
-            </Math></tag>
+          <tag>(n<sup><text font="italic">th</text></sup>)</tag>
+          <tag role="refnum">n<sup><text font="italic">th</text></sup></tag>
         </tags>
         <Math mode="display" tex="d=d" text="d = d" xml:id="S2.Ex13.m3">
           <XMath>
diff --git a/t/complex/aliceblog.xml b/t/complex/aliceblog.xml
index 944e28c89..ffc231f0a 100644
--- a/t/complex/aliceblog.xml
+++ b/t/complex/aliceblog.xml
@@ -67,17 +67,7 @@
     <paragraph inlist="toc" labels="LABEL:blog:trouble" resource="/alice/posts/trouble_with_bob" typeof="schema:BlogPosting" xml:id="S2.SS0.SSS0.Px1">
       <title property="dcterms:title">The Trouble with Bob</title>
       <para xml:id="S2.SS0.SSS0.Px1.p1">
-        <p>Date: <text content="2011-09-10" datatype="xsd:date" property="dcterms:created">10<Math mode="inline" tex="{}^{th}" text="^t * h" xml:id="S2.SS0.SSS0.Px1.p1.m1">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMApp>
-                    <XMTok meaning="times" role="MULOP">⁢</XMTok>
-                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">t</XMTok>
-                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">h</XMTok>
-                  </XMApp>
-                </XMApp>
-              </XMath>
-            </Math> of September, 2011</text>.<break/><text property="dcterms:creator schema:creator">Alice</text>.</p>
+        <p>Date: <text content="2011-09-10" datatype="xsd:date" property="dcterms:created">10<sup><text font="italic">th</text></sup> of September, 2011</text>.<break/><text property="dcterms:creator schema:creator">Alice</text>.</p>
       </para>
       <para xml:id="S2.SS0.SSS0.Px1.p2">
         <p property="schema:articleBody">The trouble with Bob is that he takes much better photos than I do.</p>
@@ -92,17 +82,7 @@ by
     <paragraph inlist="toc" labels="LABEL:blog:josbbq" resource="/alice/posts/jos_barbeque" typeof="schema:BlogPosting" xml:id="S2.SS0.SSS0.Px2">
       <title property="dcterms:title">Jo’s Barbeque</title>
       <para xml:id="S2.SS0.SSS0.Px2.p1">
-        <p>Date: <text content="2011-09-14" datatype="xsd:date" property="dcterms:created">14<Math mode="inline" tex="{}^{th}" text="^t * h" xml:id="S2.SS0.SSS0.Px2.p1.m1">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMApp>
-                    <XMTok meaning="times" role="MULOP">⁢</XMTok>
-                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">t</XMTok>
-                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">h</XMTok>
-                  </XMApp>
-                </XMApp>
-              </XMath>
-            </Math> of September, 2011</text>.<break/></p>
+        <p>Date: <text content="2011-09-14" datatype="xsd:date" property="dcterms:created">14<sup><text font="italic">th</text></sup> of September, 2011</text>.<break/></p>
       </para>
       <para xml:id="S2.SS0.SSS0.Px2.p2">
         <p><text property="dcterms:creator">Eve</text>.</p>
@@ -114,17 +94,7 @@ by
     <paragraph inlist="toc" labels="LABEL:blog:photos" resource="/alice/posts/my_photos" typeof="schema:BlogPosting" xml:id="S2.SS0.SSS0.Px3">
       <title property="dcterms:title">I will post my photos nevertheless…</title>
       <para xml:id="S2.SS0.SSS0.Px3.p1">
-        <p>Date: <text content="2011-09-15" datatype="xsd:date" property="dcterms:created">15<Math mode="inline" tex="{}^{th}" text="^t * h" xml:id="S2.SS0.SSS0.Px3.p1.m1">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMApp>
-                    <XMTok meaning="times" role="MULOP">⁢</XMTok>
-                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">t</XMTok>
-                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">h</XMTok>
-                  </XMApp>
-                </XMApp>
-              </XMath>
-            </Math> of September, 2011</text>.<break/></p>
+        <p>Date: <text content="2011-09-15" datatype="xsd:date" property="dcterms:created">15<sup><text font="italic">th</text></sup> of September, 2011</text>.<break/></p>
       </para>
       <para xml:id="S2.SS0.SSS0.Px3.p2">
         <p><text property="dcterms:creator" resourceidref="me">Alice</text>.</p>
diff --git a/t/encoding/ansinew.xml b/t/encoding/ansinew.xml
index 60b4492b6..34f58a92f 100644
--- a/t/encoding/ansinew.xml
+++ b/t/encoding/ansinew.xml
@@ -107,20 +107,8 @@
                   <XMTok meaning="plus-or-minus" name="pm" role="ADDOP">±</XMTok>
                 </XMath>
               </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m3">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{3}}" text="^3" xml:id="S1.p1.m4">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="3" role="NUMBER">3</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>2</sup></td>
+            <td align="center"><sup>3</sup></td>
             <td align="center">´</td>
             <td align="center"><Math mode="inline" tex="\mu" text="mu" xml:id="S1.p1.m5">
                 <XMath>
@@ -130,13 +118,7 @@
             <td align="center">¶</td>
             <td align="center">·</td>
             <td align="center">¸</td>
-            <td align="center"><Math mode="inline" tex="{{}^{1}}" text="^1" xml:id="S1.p1.m6">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="1" role="NUMBER">1</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>1</sup></td>
             <td align="center">º</td>
             <td align="center">»</td>
             <td align="center">¼</td>
diff --git a/t/encoding/cp1252.xml b/t/encoding/cp1252.xml
index ec6d19156..35429a699 100644
--- a/t/encoding/cp1252.xml
+++ b/t/encoding/cp1252.xml
@@ -107,20 +107,8 @@
                   <XMTok meaning="plus-or-minus" name="pm" role="ADDOP">±</XMTok>
                 </XMath>
               </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m3">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{3}}" text="^3" xml:id="S1.p1.m4">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="3" role="NUMBER">3</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>2</sup></td>
+            <td align="center"><sup>3</sup></td>
             <td align="center">´</td>
             <td align="center"><Math mode="inline" tex="\mu" text="mu" xml:id="S1.p1.m5">
                 <XMath>
@@ -130,13 +118,7 @@
             <td align="center">¶</td>
             <td align="center">·</td>
             <td align="center">¸</td>
-            <td align="center"><Math mode="inline" tex="{{}^{1}}" text="^1" xml:id="S1.p1.m6">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="1" role="NUMBER">1</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>1</sup></td>
             <td align="center">º</td>
             <td align="center">»</td>
             <td align="center">¼</td>
diff --git a/t/encoding/cp437.xml b/t/encoding/cp437.xml
index 51056da36..863d6c516 100644
--- a/t/encoding/cp437.xml
+++ b/t/encoding/cp437.xml
@@ -222,20 +222,8 @@
                   <XMTok meaning="square-root" name="surd" role="OPERATOR">√</XMTok>
                 </XMath>
               </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{n}}" text="^n" xml:id="S1.p1.m25">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">n</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m26">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup><text font="italic">n</text></sup></td>
+            <td align="center"><sup>2</sup></td>
             <td align="center"><rule depth="-1.0pt" height="4.0pt" width="3.0pt"/></td>
             <td/>
           </tr>
diff --git a/t/encoding/cp437de.xml b/t/encoding/cp437de.xml
index 5816af482..09da695df 100644
--- a/t/encoding/cp437de.xml
+++ b/t/encoding/cp437de.xml
@@ -218,20 +218,8 @@
                   <XMTok meaning="square-root" name="surd" role="OPERATOR">√</XMTok>
                 </XMath>
               </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{n}}" text="^n" xml:id="S1.p1.m24">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">n</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m25">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup><text font="italic">n</text></sup></td>
+            <td align="center"><sup>2</sup></td>
             <td align="center"><rule depth="-1.0pt" height="4.0pt" width="3.0pt"/></td>
             <td/>
           </tr>
diff --git a/t/encoding/cp850.pdf b/t/encoding/cp850.pdf
index 8c316d866..9796c6570 100644
Binary files a/t/encoding/cp850.pdf and b/t/encoding/cp850.pdf differ
diff --git a/t/encoding/cp850.xml b/t/encoding/cp850.xml
index 8ef023b4d..af526abfa 100644
--- a/t/encoding/cp850.xml
+++ b/t/encoding/cp850.xml
@@ -204,27 +204,9 @@
             <td align="center">°</td>
             <td align="center">¨</td>
             <td align="center">·</td>
-            <td align="center"><Math mode="inline" tex="{{}^{1}}" text="^1" xml:id="S1.p1.m6">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="1" role="NUMBER">1</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{3}}" text="^3" xml:id="S1.p1.m7">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="3" role="NUMBER">3</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m8">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>1</sup></td>
+            <td align="center"><sup>3</sup></td>
+            <td align="center"><sup>2</sup></td>
             <td align="center"><rule depth="-1.0pt" height="4.0pt" width="3.0pt"/></td>
             <td/>
           </tr>
diff --git a/t/encoding/cp858.pdf b/t/encoding/cp858.pdf
index f4d4ca089..33bfded60 100644
Binary files a/t/encoding/cp858.pdf and b/t/encoding/cp858.pdf differ
diff --git a/t/encoding/cp858.xml b/t/encoding/cp858.xml
index 020cbd7ea..f2042071e 100644
--- a/t/encoding/cp858.xml
+++ b/t/encoding/cp858.xml
@@ -204,27 +204,9 @@
             <td align="center">°</td>
             <td align="center">¨</td>
             <td align="center">·</td>
-            <td align="center"><Math mode="inline" tex="{{}^{1}}" text="^1" xml:id="S1.p1.m6">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="1" role="NUMBER">1</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{3}}" text="^3" xml:id="S1.p1.m7">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="3" role="NUMBER">3</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m8">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>1</sup></td>
+            <td align="center"><sup>3</sup></td>
+            <td align="center"><sup>2</sup></td>
             <td align="center"><rule depth="-1.0pt" height="4.0pt" width="3.0pt"/></td>
             <td/>
           </tr>
diff --git a/t/encoding/cp865.xml b/t/encoding/cp865.xml
index b777342ef..94e786c6e 100644
--- a/t/encoding/cp865.xml
+++ b/t/encoding/cp865.xml
@@ -222,20 +222,8 @@
                   <XMTok meaning="square-root" name="surd" role="OPERATOR">√</XMTok>
                 </XMath>
               </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{n}}" text="^n" xml:id="S1.p1.m25">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">n</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m26">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup><text font="italic">n</text></sup></td>
+            <td align="center"><sup>2</sup></td>
             <td align="center"><rule depth="-1.0pt" height="4.0pt" width="3.0pt"/></td>
             <td/>
           </tr>
diff --git a/t/encoding/decmulti.xml b/t/encoding/decmulti.xml
index 3297ebeef..a5c9474a5 100644
--- a/t/encoding/decmulti.xml
+++ b/t/encoding/decmulti.xml
@@ -65,20 +65,8 @@
                   <XMTok meaning="plus-or-minus" name="pm" role="ADDOP">±</XMTok>
                 </XMath>
               </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m2">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{3}}" text="^3" xml:id="S1.p1.m3">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="3" role="NUMBER">3</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>2</sup></td>
+            <td align="center"><sup>3</sup></td>
             <td/>
             <td align="center"><Math mode="inline" tex="\mu" text="mu" xml:id="S1.p1.m4">
                 <XMath>
@@ -88,13 +76,7 @@
             <td align="center">¶</td>
             <td align="center">·</td>
             <td/>
-            <td align="center"><Math mode="inline" tex="{{}^{1}}" text="^1" xml:id="S1.p1.m5">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="1" role="NUMBER">1</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>1</sup></td>
             <td align="center">º</td>
             <td align="center">»</td>
             <td align="center">¼</td>
diff --git a/t/encoding/latin1.xml b/t/encoding/latin1.xml
index a941821fd..52916d21d 100644
--- a/t/encoding/latin1.xml
+++ b/t/encoding/latin1.xml
@@ -69,20 +69,8 @@
                   <XMTok meaning="plus-or-minus" name="pm" role="ADDOP">±</XMTok>
                 </XMath>
               </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m3">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{3}}" text="^3" xml:id="S1.p1.m4">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="3" role="NUMBER">3</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>2</sup></td>
+            <td align="center"><sup>3</sup></td>
             <td align="center">´</td>
             <td align="center"><Math mode="inline" tex="\mu" text="mu" xml:id="S1.p1.m5">
                 <XMath>
@@ -92,13 +80,7 @@
             <td align="center">¶</td>
             <td align="center">·</td>
             <td align="center">¸</td>
-            <td align="center"><Math mode="inline" tex="{{}^{1}}" text="^1" xml:id="S1.p1.m6">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="1" role="NUMBER">1</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>1</sup></td>
             <td align="center">º</td>
             <td align="center">»</td>
             <td align="center">¼</td>
diff --git a/t/encoding/latin3.xml b/t/encoding/latin3.xml
index e3da9ab29..27eca8328 100644
--- a/t/encoding/latin3.xml
+++ b/t/encoding/latin3.xml
@@ -61,20 +61,8 @@
             <td align="left" border="r" thead="row">Bx</td>
             <td align="center">°</td>
             <td/>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m1">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{3}}" text="^3" xml:id="S1.p1.m2">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="3" role="NUMBER">3</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>2</sup></td>
+            <td align="center"><sup>3</sup></td>
             <td align="center">´</td>
             <td align="center"><Math mode="inline" tex="\mu" text="mu" xml:id="S1.p1.m3">
                 <XMath>
diff --git a/t/encoding/latin5.xml b/t/encoding/latin5.xml
index eac43c73c..e01fef24d 100644
--- a/t/encoding/latin5.xml
+++ b/t/encoding/latin5.xml
@@ -69,20 +69,8 @@
                   <XMTok meaning="plus-or-minus" name="pm" role="ADDOP">±</XMTok>
                 </XMath>
               </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m3">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{3}}" text="^3" xml:id="S1.p1.m4">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="3" role="NUMBER">3</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>2</sup></td>
+            <td align="center"><sup>3</sup></td>
             <td align="center">´</td>
             <td align="center"><Math mode="inline" tex="\mu" text="mu" xml:id="S1.p1.m5">
                 <XMath>
@@ -92,13 +80,7 @@
             <td align="center">¶</td>
             <td align="center">·</td>
             <td align="center">¸</td>
-            <td align="center"><Math mode="inline" tex="{{}^{1}}" text="^1" xml:id="S1.p1.m6">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="1" role="NUMBER">1</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>1</sup></td>
             <td align="center">º</td>
             <td align="center">»</td>
             <td align="center">¼</td>
diff --git a/t/encoding/latin9.xml b/t/encoding/latin9.xml
index 8cf6e7149..2c62a142c 100644
--- a/t/encoding/latin9.xml
+++ b/t/encoding/latin9.xml
@@ -259,20 +259,8 @@
                   <XMTok meaning="plus-or-minus" name="pm" role="ADDOP">±</XMTok>
                 </XMath>
               </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{2}}" text="^2" xml:id="S1.p1.m3">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center"><Math mode="inline" tex="{{}^{3}}" text="^3" xml:id="S1.p1.m4">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="3" role="NUMBER">3</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>2</sup></td>
+            <td align="center"><sup>3</sup></td>
             <td align="center">Ž</td>
             <td align="center"><Math mode="inline" tex="\mu" text="mu" xml:id="S1.p1.m5">
                 <XMath>
@@ -282,13 +270,7 @@
             <td align="center">¶</td>
             <td align="center">·</td>
             <td align="center">ž</td>
-            <td align="center"><Math mode="inline" tex="{{}^{1}}" text="^1" xml:id="S1.p1.m6">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="2">
-                    <XMTok fontsize="70%" meaning="1" role="NUMBER">1</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center"><sup>1</sup></td>
             <td align="center">º</td>
             <td align="center">»</td>
             <td align="center">Œ</td>
diff --git a/t/expansion/noexpand.xml b/t/expansion/noexpand.xml
index 50fd42868..a0aa6cf40 100644
--- a/t/expansion/noexpand.xml
+++ b/t/expansion/noexpand.xml
@@ -30,22 +30,10 @@
       <p>noexpand STAR:</p>
     </para>
     <para xml:id="S1.p7">
-      <p>square: <Math mode="inline" tex="{}^{2}" text="^2" xml:id="S1.p7.m1">
-          <XMath>
-            <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-              <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-            </XMApp>
-          </XMath>
-        </Math></p>
+      <p>square: <sup>2</sup></p>
     </para>
     <para xml:id="S1.p8">
-      <p>noexpand square: <Math mode="inline" tex="{}^{2}" text="^2" xml:id="S1.p8.m1">
-          <XMath>
-            <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-              <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-            </XMApp>
-          </XMath>
-        </Math></p>
+      <p>noexpand square: <sup>2</sup></p>
     </para>
   </section>
   <section inlist="toc" xml:id="S2">
@@ -74,22 +62,10 @@
       <p>unexpanded STAR: STAR</p>
     </para>
     <para xml:id="S2.p7">
-      <p>square: <Math mode="inline" tex="{}^{2}" text="^2" xml:id="S2.p7.m1">
-          <XMath>
-            <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-              <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-            </XMApp>
-          </XMath>
-        </Math></p>
+      <p>square: <sup>2</sup></p>
     </para>
     <para xml:id="S2.p8">
-      <p>unexpanded square: <Math mode="inline" tex="{}^{2}" text="^2" xml:id="S2.p8.m1">
-          <XMath>
-            <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-              <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-            </XMApp>
-          </XMath>
-        </Math></p>
+      <p>unexpanded square: <sup>2</sup></p>
     </para>
   </section>
   <section inlist="toc" xml:id="S3">
diff --git a/t/graphics/graphrot.xml b/t/graphics/graphrot.xml
index 855be97f5..bcf271b86 100644
--- a/t/graphics/graphrot.xml
+++ b/t/graphics/graphrot.xml
@@ -267,27 +267,9 @@ the whales Save the whale Save the <ref class="ltx_href" href="http://dlmf.nist.
                 </inline-block>—</text></td>
           </tr>
           <tr>
-            <td align="center" border="l r">0<Math mode="inline" tex="{}^{\mathrm{o}}" text="^o" xml:id="S2.F1.m1">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="63%" role="UNKNOWN">o</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center" border="r">-40<Math mode="inline" tex="{}^{\mathrm{o}}" text="^o" xml:id="S2.F1.m2">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="63%" role="UNKNOWN">o</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center" border="r">-80<Math mode="inline" tex="{}^{\mathrm{o}}" text="^o" xml:id="S2.F1.m3">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="63%" role="UNKNOWN">o</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center" border="l r">0<sup><text font="italic" fontsize="90%">o</text></sup></td>
+            <td align="center" border="r">-40<sup><text font="italic" fontsize="90%">o</text></sup></td>
+            <td align="center" border="r">-80<sup><text font="italic" fontsize="90%">o</text></sup></td>
           </tr>
           <tr>
             <td align="center" border="l r t"><text framecolor="#000000" framed="rectangle">—<inline-block angle="-120" depth="75.1pt" height="9.0pt" innerdepth="18.0pt" innerheight="25.0pt" innerwidth="72.3pt" width="73.3pt" xtranslate="0.53pt" ytranslate="-27.56pt">
@@ -310,27 +292,9 @@ the whales Save the whale Save the <ref class="ltx_href" href="http://dlmf.nist.
                 </inline-block>—</text></td>
           </tr>
           <tr>
-            <td align="center" border="l r">120<Math mode="inline" tex="{}^{\mathrm{o}}" text="^o" xml:id="S2.F1.m4">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="63%" role="UNKNOWN">o</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center" border="r">-160<Math mode="inline" tex="{}^{\mathrm{o}}" text="^o" xml:id="S2.F1.m5">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="63%" role="UNKNOWN">o</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center" border="r">-200<Math mode="inline" tex="{}^{\mathrm{o}}" text="^o" xml:id="S2.F1.m6">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="63%" role="UNKNOWN">o</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center" border="l r">120<sup><text font="italic" fontsize="90%">o</text></sup></td>
+            <td align="center" border="r">-160<sup><text font="italic" fontsize="90%">o</text></sup></td>
+            <td align="center" border="r">-200<sup><text font="italic" fontsize="90%">o</text></sup></td>
           </tr>
           <tr>
             <td align="center" border="l r t"><text framecolor="#000000" framed="rectangle">—<inline-block angle="-240" depth="12.5pt" height="71.6pt" innerdepth="18.0pt" innerheight="25.0pt" innerwidth="72.3pt" width="73.3pt" xtranslate="0.53pt" ytranslate="0.91pt">
@@ -353,27 +317,9 @@ the whales Save the whale Save the <ref class="ltx_href" href="http://dlmf.nist.
                 </inline-block>—</text></td>
           </tr>
           <tr>
-            <td align="center" border="b l r">-240<Math mode="inline" tex="{}^{\mathrm{o}}" text="^o" xml:id="S2.F1.m7">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="63%" role="UNKNOWN">o</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center" border="b r">-280<Math mode="inline" tex="{}^{\mathrm{o}}" text="^o" xml:id="S2.F1.m8">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="63%" role="UNKNOWN">o</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
-            <td align="center" border="b r">-320<Math mode="inline" tex="{}^{\mathrm{o}}" text="^o" xml:id="S2.F1.m9">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="63%" role="UNKNOWN">o</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></td>
+            <td align="center" border="b l r">-240<sup><text font="italic" fontsize="90%">o</text></sup></td>
+            <td align="center" border="b r">-280<sup><text font="italic" fontsize="90%">o</text></sup></td>
+            <td align="center" border="b r">-320<sup><text font="italic" fontsize="90%">o</text></sup></td>
           </tr>
         </tbody>
       </tabular>
diff --git a/t/math/niceunits.xml b/t/math/niceunits.xml
index c32a1e3bd..6e29335f7 100644
--- a/t/math/niceunits.xml
+++ b/t/math/niceunits.xml
@@ -222,19 +222,7 @@
     </para>
     <para xml:id="S3.p5">
       <p>In arXiv examples:
-Dose (10<Math mode="inline" tex="{}^{14}" text="^14" xml:id="S3.p5.m1">
-          <XMath>
-            <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-              <XMTok fontsize="70%" meaning="14" role="NUMBER">14</XMTok>
-            </XMApp>
-          </XMath>
-        </Math> ions/cm<Math mode="inline" tex="{}^{2}" text="^2" xml:id="S3.p5.m2">
-          <XMath>
-            <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-              <XMTok fontsize="70%" meaning="2" role="NUMBER">2</XMTok>
-            </XMApp>
-          </XMath>
-        </Math>)</p>
+Dose (10<sup><text font="italic">14</text></sup> ions/cm<sup>2</sup>)</p>
     </para>
     <para xml:id="S3.p6">
       <p>And also handles mathematics
diff --git a/t/math/testscripts.xml b/t/math/testscripts.xml
index 5fada6f0e..2a74b8daa 100644
--- a/t/math/testscripts.xml
+++ b/t/math/testscripts.xml
@@ -55,19 +55,7 @@
     </equation>
   </para>
   <para xml:id="p2">
-    <p><Math mode="inline" tex="{}_{a}" text="_a" xml:id="p2.m1">
-        <XMath>
-          <XMApp role="FLOATSUBSCRIPT" scriptpos="1">
-            <XMTok font="italic" fontsize="70%" role="UNKNOWN">a</XMTok>
-          </XMApp>
-        </XMath>
-      </Math>, <Math mode="inline" tex="{}^{a}" text="^a" xml:id="p2.m2">
-        <XMath>
-          <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-            <XMTok font="italic" fontsize="70%" role="UNKNOWN">a</XMTok>
-          </XMApp>
-        </XMath>
-      </Math></p>
+    <p><sub><text font="italic">a</text></sub>, <sup><text font="italic">a</text></sup></p>
   </para>
   <para xml:id="p3">
     <equation xml:id="S0.Ex2">
diff --git a/t/parse/scripts.pdf b/t/parse/scripts.pdf
index fd20cfc6a..f00a8b7a8 100644
Binary files a/t/parse/scripts.pdf and b/t/parse/scripts.pdf differ
diff --git a/t/parse/scripts.xml b/t/parse/scripts.xml
index f8deb5b5b..9a9b5d30a 100644
--- a/t/parse/scripts.xml
+++ b/t/parse/scripts.xml
@@ -5,22 +5,10 @@
   <resource src="LaTeXML.css" type="text/css"/>
   <resource src="ltx-article.css" type="text/css"/>
   <para xml:id="p1">
-    <p>A<Math mode="inline" tex="{}^{c}" text="^c" xml:id="p1.m1">
-        <XMath>
-          <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-            <XMTok font="italic" fontsize="70%" role="UNKNOWN">c</XMTok>
-          </XMApp>
-        </XMath>
-      </Math></p>
+    <p>A<sup><text font="italic">c</text></sup></p>
   </para>
   <para xml:id="p2">
-    <p>A<Math mode="inline" tex="{}_{d}" text="_d" xml:id="p2.m1">
-        <XMath>
-          <XMApp role="FLOATSUBSCRIPT" scriptpos="1">
-            <XMTok font="italic" fontsize="70%" role="UNKNOWN">d</XMTok>
-          </XMApp>
-        </XMath>
-      </Math></p>
+    <p>A<sub><text font="italic">d</text></sub></p>
   </para>
   <para xml:id="p3">
     <p>A<Math mode="inline" tex="{}^{c}_{d}" text="_ d ^ c absent" xml:id="p3.m1">
@@ -128,41 +116,10 @@
       </Math></p>
   </para>
   <para xml:id="p10">
-    <p><Math mode="inline" tex="{}_{x&lt;3,&gt;0}" text="_list@(x &lt; 3, absent &gt; 0)" xml:id="p10.m1">
-        <XMath>
-          <XMApp role="FLOATSUBSCRIPT" scriptpos="1">
-            <XMDual>
-              <XMApp>
-                <XMTok meaning="list"/>
-                <XMRef idref="p10.m1.1"/>
-                <XMRef idref="p10.m1.2"/>
-              </XMApp>
-              <XMWrap>
-                <XMApp xml:id="p10.m1.1">
-                  <XMTok fontsize="70%" meaning="less-than" role="RELOP">&lt;</XMTok>
-                  <XMTok font="italic" fontsize="70%" role="UNKNOWN">x</XMTok>
-                  <XMTok fontsize="70%" meaning="3" role="NUMBER">3</XMTok>
-                </XMApp>
-                <XMTok fontsize="70%" role="PUNCT">,</XMTok>
-                <XMApp xml:id="p10.m1.2">
-                  <XMTok fontsize="70%" meaning="greater-than" role="RELOP">&gt;</XMTok>
-                  <XMTok meaning="absent"/>
-                  <XMTok fontsize="70%" meaning="0" role="NUMBER">0</XMTok>
-                </XMApp>
-              </XMWrap>
-            </XMDual>
-          </XMApp>
-        </XMath>
-      </Math></p>
+    <p><sub><text font="italic">x&lt;3,&gt;0</text></sub></p>
   </para>
   <para xml:id="p11">
-    <p><Math mode="inline" tex="{}^{\prime\prime\prime}" text="^prime3" xml:id="p11.m1">
-        <XMath>
-          <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-            <XMTok fontsize="70%" name="prime3" role="SUPOP">′′′</XMTok>
-          </XMApp>
-        </XMath>
-      </Math></p>
+    <p><sup><text font="italic">′′′</text></sup></p>
   </para>
   <para xml:id="p12">
     <p><Math mode="inline" tex="\mathrm{Na}^{+}" text="Na ^ +" xml:id="p12.m1">
diff --git a/t/structure/eqnums.xml b/t/structure/eqnums.xml
index 753de7ac9..2fd09c2ea 100644
--- a/t/structure/eqnums.xml
+++ b/t/structure/eqnums.xml
@@ -61,20 +61,8 @@ even if later on, the equation tag is removed or set explicitly!</p>
       <p>Numbered, Tag before (w/eq=1)</p>
       <equation xml:id="S1.Ex3">
         <tags>
-          <tag>(1<Math mode="inline" tex="{}^{\prime}" text="^prime" xml:id="S1.Ex3.m1">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime" role="SUPOP">′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math>)</tag>
-          <tag role="refnum">1<Math mode="inline" tex="{}^{\prime}" text="^prime" xml:id="S1.Ex3.m2">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime" role="SUPOP">′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math></tag>
+          <tag>(1<sup><text font="italic">′</text></sup>)</tag>
+          <tag role="refnum">1<sup><text font="italic">′</text></sup></tag>
         </tags>
         <Math mode="display" tex="N=\mbox{1}" text="N = [1]" xml:id="S1.Ex3.m3">
           <XMath>
@@ -89,20 +77,8 @@ even if later on, the equation tag is removed or set explicitly!</p>
       <p>Numbered, Tag after (w/eq=1)</p>
       <equation xml:id="S1.Ex4">
         <tags>
-          <tag>(1<Math mode="inline" tex="{}^{\prime\prime}" text="^prime2" xml:id="S1.Ex4.m1">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime2" role="SUPOP">′′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math>)</tag>
-          <tag role="refnum">1<Math mode="inline" tex="{}^{\prime\prime}" text="^prime2" xml:id="S1.Ex4.m2">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime2" role="SUPOP">′′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math></tag>
+          <tag>(1<sup><text font="italic">′′</text></sup>)</tag>
+          <tag role="refnum">1<sup><text font="italic">′′</text></sup></tag>
         </tags>
         <Math mode="display" tex="N=\mbox{2}" text="N = [2]" xml:id="S1.Ex4.m3">
           <XMath>
@@ -162,20 +138,8 @@ even if later on, the equation tag is removed or set explicitly!</p>
       <p>UnNumbered, Tag before (w/eq=1)</p>
       <equation xml:id="S1.Ex8">
         <tags>
-          <tag>(1<Math mode="inline" tex="{}^{\prime\prime\prime}" text="^prime3" xml:id="S1.Ex8.m1">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime3" role="SUPOP">′′′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math>)</tag>
-          <tag role="refnum">1<Math mode="inline" tex="{}^{\prime\prime\prime}" text="^prime3" xml:id="S1.Ex8.m2">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime3" role="SUPOP">′′′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math></tag>
+          <tag>(1<sup><text font="italic">′′′</text></sup>)</tag>
+          <tag role="refnum">1<sup><text font="italic">′′′</text></sup></tag>
         </tags>
         <Math mode="display" tex="N=\mbox{1}" text="N = [1]" xml:id="S1.Ex8.m3">
           <XMath>
@@ -190,20 +154,8 @@ even if later on, the equation tag is removed or set explicitly!</p>
       <p>UnNumbered, Tag after (w/eq=1)</p>
       <equation xml:id="S1.Ex9">
         <tags>
-          <tag>(1<Math mode="inline" tex="{}^{\prime\prime\prime\prime}" text="^prime4" xml:id="S1.Ex9.m1">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime4" role="SUPOP">′′′′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math>)</tag>
-          <tag role="refnum">1<Math mode="inline" tex="{}^{\prime\prime\prime\prime}" text="^prime4" xml:id="S1.Ex9.m2">
-              <XMath>
-                <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                  <XMTok fontsize="70%" name="prime4" role="SUPOP">′′′′</XMTok>
-                </XMApp>
-              </XMath>
-            </Math></tag>
+          <tag>(1<sup><text font="italic">′′′′</text></sup>)</tag>
+          <tag role="refnum">1<sup><text font="italic">′′′′</text></sup></tag>
         </tags>
         <Math mode="display" tex="N=\mbox{1}" text="N = [1]" xml:id="S1.Ex9.m3">
           <XMath>
@@ -622,20 +574,8 @@ until the end of line mark!</p>
         </equation>
         <equation xml:id="S3.Ex16">
           <tags>
-            <tag>(7<Math mode="inline" tex="{}^{\prime}" text="^prime" xml:id="S3.Ex16.m1">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="70%" name="prime" role="SUPOP">′</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math>)</tag>
-            <tag role="refnum">7<Math mode="inline" tex="{}^{\prime}" text="^prime" xml:id="S3.Ex16.m2">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="70%" name="prime" role="SUPOP">′</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></tag>
+            <tag>(7<sup><text font="italic">′</text></sup>)</tag>
+            <tag role="refnum">7<sup><text font="italic">′</text></sup></tag>
           </tags>
           <MathFork>
             <Math tex="\displaystyle N=\mbox{7}" text="N = [7]" xml:id="S3.Ex16.m5">
@@ -667,20 +607,8 @@ until the end of line mark!</p>
         </equation>
         <equation xml:id="S3.Ex17">
           <tags>
-            <tag>(7<Math mode="inline" tex="{}^{\prime\prime}" text="^prime2" xml:id="S3.Ex17.m1">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="70%" name="prime2" role="SUPOP">′′</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math>)</tag>
-            <tag role="refnum">7<Math mode="inline" tex="{}^{\prime\prime}" text="^prime2" xml:id="S3.Ex17.m2">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="70%" name="prime2" role="SUPOP">′′</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></tag>
+            <tag>(7<sup><text font="italic">′′</text></sup>)</tag>
+            <tag role="refnum">7<sup><text font="italic">′′</text></sup></tag>
           </tags>
           <MathFork>
             <Math tex="\displaystyle N=\mbox{7}" text="N = [7]" xml:id="S3.Ex17.m5">
@@ -746,20 +674,8 @@ until the end of line mark!</p>
         </equation>
         <equation xml:id="S3.Ex19">
           <tags>
-            <tag>(7<Math mode="inline" tex="{}^{\prime\prime\prime}" text="^prime3" xml:id="S3.Ex19.m1">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="70%" name="prime3" role="SUPOP">′′′</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math>)</tag>
-            <tag role="refnum">7<Math mode="inline" tex="{}^{\prime\prime\prime}" text="^prime3" xml:id="S3.Ex19.m2">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="70%" name="prime3" role="SUPOP">′′′</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></tag>
+            <tag>(7<sup><text font="italic">′′′</text></sup>)</tag>
+            <tag role="refnum">7<sup><text font="italic">′′′</text></sup></tag>
           </tags>
           <MathFork>
             <Math tex="\displaystyle N=\mbox{7}" text="N = [7]" xml:id="S3.Ex19.m5">
@@ -791,20 +707,8 @@ until the end of line mark!</p>
         </equation>
         <equation xml:id="S3.Ex20">
           <tags>
-            <tag>(7<Math mode="inline" tex="{}^{\prime\prime\prime\prime}" text="^prime4" xml:id="S3.Ex20.m1">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="70%" name="prime4" role="SUPOP">′′′′</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math>)</tag>
-            <tag role="refnum">7<Math mode="inline" tex="{}^{\prime\prime\prime\prime}" text="^prime4" xml:id="S3.Ex20.m2">
-                <XMath>
-                  <XMApp role="FLOATSUPERSCRIPT" scriptpos="1">
-                    <XMTok fontsize="70%" name="prime4" role="SUPOP">′′′′</XMTok>
-                  </XMApp>
-                </XMath>
-              </Math></tag>
+            <tag>(7<sup><text font="italic">′′′′</text></sup>)</tag>
+            <tag role="refnum">7<sup><text font="italic">′′′′</text></sup></tag>
           </tags>
           <MathFork>
             <Math tex="\displaystyle N=\mbox{7}" text="N = [7]" xml:id="S3.Ex20.m5">