diff --git a/chapters/classes.tex b/chapters/classes.tex
index 5c22e3940..d79032e2c 100644
--- a/chapters/classes.tex
+++ b/chapters/classes.tex
@@ -1564,7 +1564,7 @@ \subsubsection{Type Conversion of Enumeration Values to String or Integer}\label
 
 % TODO: Can't have angle brackets and \emph in the same mathescape due to LaTeXML issue:
 % - https://github.com/brucemiller/LaTeXML/issues/1477
-% Once the issue has been fixed, change to single mathescape for better character spacing.
+% Once we cut the MathJax dependency, change to single mathescape for better character spacing.
 The type conversion function \lstinline!Integer($\langle$$\mbox{\emph{expression of enumeration type}}$$\rangle$)! returns the ordinal number of the enumeration value \lstinline!E.enumvalue!, to which the expression is evaluated, where $\text{\lstinline!Integer(E.e1)!} = 1$, $\text{\lstinline!Integer(E.en)!} = n$, for an enumeration type \lstinline!E = enumeration(e1, $\ldots$, en)!.
 
 \lstinline!String(E.enumvalue)! gives the \lstinline!String! representation of the enumeration value.
@@ -1584,7 +1584,7 @@ \subsubsection{Type Conversion of Integer to Enumeration Values}\label{type-conv
 
 % TODO: Can't have angle brackets and \emph in the same mathescape due to LaTeXML issue:
 % - https://github.com/brucemiller/LaTeXML/issues/1477
-% Once the issue has been fixed, change to single mathescape for better character spacing.
+% Once we cut the MathJax dependency, change to single mathescape for better character spacing.
 For an enumeration type named \lstinline!EnumTypeName!, the expression \lstinline!EnumTypeName($\langle$$\mbox{\emph{Integer expression}}$$\rangle$)! returns the enumeration value \lstinline!EnumTypeName.e! such that \lstinline!Integer(EnumTypeName.e)! is equal to the original integer expression.
 
 Attempting to convert an integer argument that does not correspond to a
diff --git a/chapters/connectors.tex b/chapters/connectors.tex
index 89782e160..bedda9637 100644
--- a/chapters/connectors.tex
+++ b/chapters/connectors.tex
@@ -789,7 +789,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\label{over
 A type or record declaration may have an optional definition of function \lstinline!equalityConstraint! that shall have the following prototype:
 % TODO: Can't have angle brackets and \emph in the same mathescape due to LaTeXML issue:
 % - https://github.com/brucemiller/LaTeXML/issues/1477
-% Once the issue has been fixed, change to single mathescape for better character spacing.
+% Once we cut the MathJax dependency, change to single mathescape for better character spacing.
 \begin{lstlisting}[language=modelica]
 type Type // overdetermined type
   extends $\langle$$\mbox{\emph{base type}}$$\rangle$;
@@ -879,7 +879,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\label{over
 \begin{nonnormative}
 % TODO: Can't have angle brackets and \emph in the same mathescape due to LaTeXML issue:
 % - https://github.com/brucemiller/LaTeXML/issues/1477
-% Once the issue has been fixed, change to single mathescape for better character spacing.
+% Once we cut the MathJax dependency, change to single mathescape for better character spacing.
 E.g., it is not allowed to use this function in a when-clause.
 This definition shall be used if in a model with connectors \lstinline!A! and \lstinline!B! the overdetermined records \lstinline!A.R! and \lstinline!B.R! are algebraically coupled in the model, e.g., due to \lstinline!B.R = f(A.R, $\langle$$\mbox{\emph{other unknowns}}$$\rangle$)!.
 \end{nonnormative}
diff --git a/chapters/functions.tex b/chapters/functions.tex
index 1bf2c5d41..14609cb10 100644
--- a/chapters/functions.tex
+++ b/chapters/functions.tex
@@ -14,7 +14,7 @@ \section{Function Declaration}\label{function-declaration}
 the following schematic function example:
 % TODO: Can't have angle brackets and \emph in the same mathescape due to LaTeXML issue:
 % - https://github.com/brucemiller/LaTeXML/issues/1477
-% Once the issue has been fixed, change to single mathescape for better character spacing.
+% Once we cut the MathJax dependency, change to single mathescape for better character spacing.
 \begin{lstlisting}[language=modelica]
 function $\mathit{functionname}$
   input  TypeI1 in1;
diff --git a/chapters/synchronous.tex b/chapters/synchronous.tex
index 333b0f8f1..8c355b6a2 100644
--- a/chapters/synchronous.tex
+++ b/chapters/synchronous.tex
@@ -814,7 +814,7 @@ \section{Clocked When-Clause}\label{clocked-when-clause}
 In addition to the previously discussed conditional when-clause, a \emph{clocked} when-clause\index{clocked!when-clause}\index{when-clause!clocked} is introduced:
 % TODO: Can't have angle brackets and \emph in the same mathescape due to LaTeXML issue:
 % - https://github.com/brucemiller/LaTeXML/issues/1477
-% Once the issue has been fixed, change to single mathescape for better character spacing.
+% Once we cut the MathJax dependency, change to single mathescape for better character spacing.
 \begin{lstlisting}[language=modelica]
 when $\mathit{clockExpression}$ then
   $\langle$$\mbox{\emph{clocked equations}}$$\rangle$