diff --git a/source/support.tex b/source/support.tex
index 7f55876592..7c34b19bd9 100644
--- a/source/support.tex
+++ b/source/support.tex
@@ -3399,7 +3399,7 @@
     const char* name() const noexcept;
 
   private:
-    const type_info* target;    // \expos
+    const type_info* @\exposid{target}@;    // \expos
     // Note that the use of a pointer here, rather than a reference,
     // means that the default copy/move constructor and assignment
     // operators will be provided and work as expected.
@@ -3421,7 +3421,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Constructs a \tcode{type_index} object, the equivalent of \tcode{target = \&rhs}.
+Constructs a \tcode{type_index} object, the equivalent of \tcode{\exposid{target} = \&rhs}.
 \end{itemdescr}
 
 \indexlibrarymember{operator==}{type_index}%
@@ -3432,7 +3432,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{*target == *rhs.target}.
+\tcode{*\exposid{target} == *rhs.\exposid{target}}.
 \end{itemdescr}
 
 \indexlibrarymember{operator<}{type_index}%
@@ -3443,7 +3443,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{target->before(*rhs.target)}.
+\tcode{\exposid{target}->before(*rhs.\exposid{target})}.
 \end{itemdescr}
 
 \indexlibrarymember{operator>}{type_index}%
@@ -3454,7 +3454,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{rhs.target->before(*target)}.
+\tcode{rhs.\exposid{target}->before(*\exposid{target})}.
 \end{itemdescr}
 
 \indexlibrarymember{operator<=}{type_index}%
@@ -3465,7 +3465,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{!rhs.target->before(*target)}.
+\tcode{!rhs.\exposid{target}->before(*\exposid{target})}.
 \end{itemdescr}
 
 \indexlibrarymember{operator>=}{type_index}%
@@ -3476,7 +3476,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{!target->before(*rhs.target)}.
+\tcode{!\exposid{target}->before(*rhs.\exposid{target})}.
 \end{itemdescr}
 
 \indexlibrarymember{operator<=>}{type_index}%
@@ -3489,8 +3489,8 @@
 \effects
 Equivalent to:
 \begin{codeblock}
-if (*target == *rhs.target) return strong_ordering::equal;
-if (target->before(*rhs.target)) return strong_ordering::less;
+if (*@\exposid{target}@ == *rhs.@\exposid{target}@) return strong_ordering::equal;
+if (@\exposid{target}@->before(*rhs.@\exposid{target}@)) return strong_ordering::less;
 return strong_ordering::greater;
 \end{codeblock}
 \end{itemdescr}
@@ -3503,7 +3503,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{target->hash_code()}.
+\tcode{\exposid{target}->hash_code()}.
 \end{itemdescr}
 
 \indexlibrarymember{name}{type_index}%
@@ -3514,7 +3514,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{target->name()}.
+\tcode{\exposid{target}->name()}.
 \end{itemdescr}
 
 \indexlibrarymember{hash}{type_index}%
@@ -3566,10 +3566,10 @@
     constexpr const char* function_name() const noexcept;
 
   private:
-    uint_least32_t line_;               // \expos
-    uint_least32_t column_;             // \expos
-    const char* file_name_;             // \expos
-    const char* function_name_;         // \expos
+    uint_least32_t @\exposid{line_}@;               // \expos
+    uint_least32_t @\exposid{column_}@;             // \expos
+    const char* @\exposid{file_name_}@;             // \expos
+    const char* @\exposid{function_name_}@;         // \expos
   };
 }
 \end{codeblock}
@@ -3586,7 +3586,7 @@
 \end{note}
 
 \pnum
-The data members \tcode{file_name_} and \tcode{function_name_}
+The data members \exposid{file_name_} and \exposid{function_name_}
 always each refer to an \ntbs{}.
 
 \pnum
@@ -3627,21 +3627,21 @@
 \begin{libefftabvalue}
   {Value of object returned by \tcode{current}}
   {support.srcloc.current}
-\tcode{line_}    &
+\exposid{line_}    &
   A presumed line number\iref{cpp.predefined}.
   Line numbers are presumed to be 1-indexed;
   however, an implementation is encouraged to use 0
   when the line number is unknown. \\ \rowsep
-\tcode{column_}  &
+\exposid{column_}  &
   An \impldef{column value of \tcode{source_location::current}} value denoting
-  some offset from the start of the line denoted by \tcode{line_}.
+  some offset from the start of the line denoted by \exposid{line_}.
   Column numbers are presumed to be 1-indexed;
   however, an implementation is encouraged to use 0
   when the column number is unknown. \\ \rowsep
-\tcode{file_name_} &
+\exposid{file_name_} &
   A presumed name of the current source file\iref{cpp.predefined} as an \ntbs{}.
   \\ \rowsep
-\tcode{function_name_} &
+\exposid{function_name_} &
   A name of the current function
   such as in \mname{func}\iref{dcl.fct.def.general} if any,
   an empty string otherwise. \\
@@ -3714,7 +3714,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{line_}.
+\exposid{line_}.
 \end{itemdescr}
 
 \begin{itemdecl}
@@ -3723,7 +3723,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{column_}.
+\exposid{column_}.
 \end{itemdescr}
 
 \begin{itemdecl}
@@ -3732,7 +3732,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{file_name_}.
+\exposid{file_name_}.
 \end{itemdescr}
 
 \begin{itemdecl}
@@ -3741,7 +3741,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{function_name_}.
+\exposid{function_name_}.
 \end{itemdescr}
 
 \rSec1[support.exception]{Exception handling}
@@ -5738,7 +5738,7 @@
     void destroy() const;
 
   private:
-    void* ptr;  // \expos
+    void* @\exposid{ptr}@;  // \expos
   };
 
   template<class Promise>
@@ -5769,7 +5769,7 @@
     Promise& promise() const;
 
   private:
-    void* ptr;  // \expos
+    void* @\exposid{ptr}@;  // \expos
   };
 }
 \end{codeblock}
@@ -5860,7 +5860,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{ptr}.
+\exposid{ptr}.
 \end{itemdescr}
 
 \indexlibrarymember{from_address}{coroutine_handle}%
@@ -6074,7 +6074,7 @@
     constexpr void* address() const noexcept;
   private:
     coroutine_handle(@\unspec@);
-    void* ptr;  // \expos
+    void* @\exposid{ptr}@;  // \expos
   };
 }
 \end{codeblock}
@@ -6163,11 +6163,11 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{ptr}.
+\exposid{ptr}.
 
 \pnum
 \remarks
-A \tcode{noop_coroutine_handle}'s \tcode{ptr} is always a
+A \tcode{noop_coroutine_handle}'s \exposid{ptr} is always a
 non-null pointer value.
 \end{itemdescr}