diff --git a/xml/issue4015.xml b/xml/issue4015.xml
index 2a544868ee..ba4d6b4c6a 100644
--- a/xml/issue4015.xml
+++ b/xml/issue4015.xml
@@ -284,7 +284,7 @@ constexpr optional<T>& operator=(const optional& rhs);
 
 <tr>
 <td><b><tt>rhs</tt> contains a value</b></td>
-<td>assigns <tt><del>*</del>rhs<ins>.<i>val</i></ins></tt> to <ins><i>val</i></ins><del>the contained value</del></td>
+<td>assigns <tt><del>*</del>rhs<ins>.<i>val</i></ins></tt> to <ins><tt><i>val</i></tt></ins><del>the contained value</del></td>
 <td>direct-non-list-initializes <ins><tt><i>val</i></tt></ins><del>the contained value</del> 
 with <tt><del>*</del>rhs<ins>.<i>val</i></ins></tt><br/>
 <ins>and sets <tt><i>has_val</i></tt> to <tt>true</tt></ins>
@@ -329,7 +329,7 @@ constexpr optional&lt;T&gt;&amp; operator=(optional&amp;&amp; rhs) noexcept(<i>s
 
 <tr>
 <td><b><tt>rhs</tt> contains a value</b></td>
-<td>assigns <tt>std::move(<del>*</del>rhs<ins>.<i>val</i></ins>)</tt> to <ins><i>val</i></ins><del>the contained value</del></td>
+<td>assigns <tt>std::move(<del>*</del>rhs<ins>.<i>val</i></ins>)</tt> to <ins><tt><i>val</i></tt></ins><del>the contained value</del></td>
 <td>direct-non-list-initializes <ins><tt><i>val</i></tt></ins><del>the contained value</del> with 
 <tt>std::move(<del>*</del>rhs<ins>.<i>val</i></ins>)</tt> <ins>and sets <tt><i>has_val</i></tt> to <tt>true</tt></ins></td>
 </tr>
@@ -395,7 +395,7 @@ template&lt;class U&gt; constexpr optional&lt;T&gt;&amp; operator=(const optiona
 
 <tr>
 <td><b><tt>rhs</tt> contains a value</b></td>
-<td>assigns <tt><del>*</del>rhs<ins>.<i>val</i></ins></tt> to <ins><i>val</i></ins><del>the contained value</del></td>
+<td>assigns <tt><del>*</del>rhs<ins>.<i>val</i></ins></tt> to <ins><tt><i>val</i></tt></ins><del>the contained value</del></td>
 <td>direct-non-list-initializes <ins><tt><i>val</i></tt></ins><del>the contained value</del> 
 with <tt><del>*</del>rhs<ins>.<i>val</i></ins></tt> <ins>and sets <tt><i>has_val</i></tt> to <tt>true</tt></ins></td>
 </tr>
@@ -441,7 +441,7 @@ template&lt;class U&gt; constexpr optional&lt;T&gt;&amp; operator=(optional&lt;U
 
 <tr>
 <td><b><tt>rhs</tt> contains a value</b></td>
-<td>assigns <tt>std::move(<del>*</del>rhs<ins>.<i>val</i></ins>)</tt> to <ins><i>val</i></ins><del>the contained value</del></td>
+<td>assigns <tt>std::move(<del>*</del>rhs<ins>.<i>val</i></ins>)</tt> to <ins><tt><i>val</i></tt></ins><del>the contained value</del></td>
 <td>direct-non-list-initializes <ins><tt><i>val</i></tt></ins><del>the contained value</del> with<br/>
 <tt>std::move(<del>*</del>rhs<ins>.<i>val</i></ins>)</tt> <ins>and sets <tt><i>has_val</i></tt> to <tt>true</tt></ins></td>
 </tr>
@@ -627,7 +627,7 @@ constexpr bool has_value() const noexcept;
 </pre>
 <blockquote>
 <p>
--11- <i>Returns</i>: <ins><i>has_val</i></ins><del><tt>true</tt> if and only if <tt>*this</tt> contains a value</del>.
+-11- <i>Returns</i>: <ins><tt><i>has_val</i></tt></ins><del><tt>true</tt> if and only if <tt>*this</tt> contains a value</del>.
 <p/>
 -12- <i>Remarks</i>: <ins>These functions are</ins><del>This function is a</del> constexpr function<ins>s</ins>.
 </p>