diff --git a/source/strings.tex b/source/strings.tex
index cc13d13f95..ac1cc9adbd 100644
--- a/source/strings.tex
+++ b/source/strings.tex
@@ -5034,14 +5034,14 @@
 occurs:
 \begin{itemize}
 \item
-\textit{n}
+\tcode{n}
 characters are stored;
 \item
 end-of-file occurs on the input sequence;
 \item
 \tcode{isspace(c, is.getloc())}
 is \tcode{true} for the next available input character
-\textit{c}.
+\tcode{c}.
 \end{itemize}
 
 \pnum
@@ -5109,9 +5109,9 @@
 \item
 \tcode{traits::eq(c, delim)}
 for the next available input character
-\textit{c}
+\tcode{c}
 (in which case,
-\textit{c}
+\tcode{c}
 is extracted but not appended);
 \item
 \tcode{str.max_size()}
@@ -5485,7 +5485,7 @@
 #define __STDC_VERSION_STRING_H__ 202311L
 
 namespace std {
-  using size_t = @\textit{see \ref{support.types.layout}}@;                                            // freestanding
+  using size_t = @\UNSP{see \ref{support.types.layout}}@;                                            // freestanding
 
   void* memcpy(void* s1, const void* s2, size_t n);                     // freestanding
   void* memccpy(void* s1, const void* s2, int c, size_t n);             // freestanding
@@ -5520,7 +5520,7 @@
   size_t strlen(const char* s);                                         // freestanding
 }
 
-#define NULL @\textit{see \ref{support.types.nullptr}}@                                                // freestanding
+#define NULL @\UNSP{see \ref{support.types.nullptr}}@                                                // freestanding
 \end{codeblock}
 
 \pnum
diff --git a/source/support.tex b/source/support.tex
index 4c1183a5e6..e3cd88dc7c 100644
--- a/source/support.tex
+++ b/source/support.tex
@@ -1712,9 +1712,9 @@
     static constexpr bool has_quiet_NaN     = true;
     static constexpr bool has_signaling_NaN = true;
 
-    static constexpr float infinity()      noexcept { return @\textit{value}@; }
-    static constexpr float quiet_NaN()     noexcept { return @\textit{value}@; }
-    static constexpr float signaling_NaN() noexcept { return @\textit{value}@; }
+    static constexpr float infinity()      noexcept { return @\placeholder{value}@; }
+    static constexpr float quiet_NaN()     noexcept { return @\placeholder{value}@; }
+    static constexpr float signaling_NaN() noexcept { return @\placeholder{value}@; }
     static constexpr float denorm_min()    noexcept { return min(); }
 
     static constexpr bool is_iec559  = true;
@@ -1956,47 +1956,47 @@
 #define __STDC_VERSION_STDINT_H__ 202311L
 
 namespace std {
-  using int8_t         = @\textit{signed integer type}@;   // optional
-  using int16_t        = @\textit{signed integer type}@;   // optional
-  using int32_t        = @\textit{signed integer type}@;   // optional
-  using int64_t        = @\textit{signed integer type}@;   // optional
+  using int8_t         = @\UNSPnc{signed integer type}@;   // optional
+  using int16_t        = @\UNSPnc{signed integer type}@;   // optional
+  using int32_t        = @\UNSPnc{signed integer type}@;   // optional
+  using int64_t        = @\UNSPnc{signed integer type}@;   // optional
   using int@\placeholdernc{N}@_t         = @\seebelow@;             // optional
 
-  using int_fast8_t    = @\textit{signed integer type}@;
-  using int_fast16_t   = @\textit{signed integer type}@;
-  using int_fast32_t   = @\textit{signed integer type}@;
-  using int_fast64_t   = @\textit{signed integer type}@;
+  using int_fast8_t    = @\UNSPnc{signed integer type}@;
+  using int_fast16_t   = @\UNSPnc{signed integer type}@;
+  using int_fast32_t   = @\UNSPnc{signed integer type}@;
+  using int_fast64_t   = @\UNSPnc{signed integer type}@;
   using int_fast@\placeholdernc{N}@_t    = @\seebelow@;             // optional
 
-  using int_least8_t   = @\textit{signed integer type}@;
-  using int_least16_t  = @\textit{signed integer type}@;
-  using int_least32_t  = @\textit{signed integer type}@;
-  using int_least64_t  = @\textit{signed integer type}@;
+  using int_least8_t   = @\UNSPnc{signed integer type}@;
+  using int_least16_t  = @\UNSPnc{signed integer type}@;
+  using int_least32_t  = @\UNSPnc{signed integer type}@;
+  using int_least64_t  = @\UNSPnc{signed integer type}@;
   using int_least@\placeholdernc{N}@_t   = @\seebelow@;             // optional
 
-  using intmax_t       = @\textit{signed integer type}@;
-  using intptr_t       = @\textit{signed integer type}@;   // optional
+  using intmax_t       = @\UNSPnc{signed integer type}@;
+  using intptr_t       = @\UNSPnc{signed integer type}@;   // optional
 
-  using uint8_t        = @\textit{unsigned integer type}@; // optional
-  using uint16_t       = @\textit{unsigned integer type}@; // optional
-  using uint32_t       = @\textit{unsigned integer type}@; // optional
-  using uint64_t       = @\textit{unsigned integer type}@; // optional
+  using uint8_t        = @\UNSPnc{unsigned integer type}@; // optional
+  using uint16_t       = @\UNSPnc{unsigned integer type}@; // optional
+  using uint32_t       = @\UNSPnc{unsigned integer type}@; // optional
+  using uint64_t       = @\UNSPnc{unsigned integer type}@; // optional
   using uint@\placeholdernc{N}@_t        = @\seebelow@;             // optional
 
-  using uint_fast8_t   = @\textit{unsigned integer type}@;
-  using uint_fast16_t  = @\textit{unsigned integer type}@;
-  using uint_fast32_t  = @\textit{unsigned integer type}@;
-  using uint_fast64_t  = @\textit{unsigned integer type}@;
+  using uint_fast8_t   = @\UNSPnc{unsigned integer type}@;
+  using uint_fast16_t  = @\UNSPnc{unsigned integer type}@;
+  using uint_fast32_t  = @\UNSPnc{unsigned integer type}@;
+  using uint_fast64_t  = @\UNSPnc{unsigned integer type}@;
   using uint_fast@\placeholdernc{N}@_t   = @\seebelow@;             // optional
 
-  using uint_least8_t  = @\textit{unsigned integer type}@;
-  using uint_least16_t = @\textit{unsigned integer type}@;
-  using uint_least32_t = @\textit{unsigned integer type}@;
-  using uint_least64_t = @\textit{unsigned integer type}@;
+  using uint_least8_t  = @\UNSPnc{unsigned integer type}@;
+  using uint_least16_t = @\UNSPnc{unsigned integer type}@;
+  using uint_least32_t = @\UNSPnc{unsigned integer type}@;
+  using uint_least64_t = @\UNSPnc{unsigned integer type}@;
   using uint_least@\placeholdernc{N}@_t  = @\seebelow@;             // optional
 
-  using uintmax_t      = @\textit{unsigned integer type}@;
-  using uintptr_t      = @\textit{unsigned integer type}@; // optional
+  using uintmax_t      = @\UNSPnc{unsigned integer type}@;
+  using uintptr_t      = @\UNSPnc{unsigned integer type}@; // optional
 }
 
 #define INT@\placeholdernc{N}@_MIN          @\seebelow@