diff --git a/Sources/Tokenizer/Tokenizer.swift b/Sources/Tokenizer/Tokenizer.swift
index 8a244e4..6a2d6b3 100644
--- a/Sources/Tokenizer/Tokenizer.swift
+++ b/Sources/Tokenizer/Tokenizer.swift
@@ -1381,8 +1381,8 @@ public struct Tokenizer<Sink: ~Copyable & TokenSink>: ~Copyable {
 
     @_disfavoredOverload
     @inline(__always)
-    private mutating func createComment(with s: consuming String) {
-        self.currentComment = .init(s.unicodeScalars)
+    private mutating func createComment(with s: consuming Str) {
+        self.currentComment = s
     }
 
     @inline(__always)
@@ -1392,8 +1392,8 @@ public struct Tokenizer<Sink: ~Copyable & TokenSink>: ~Copyable {
 
     @_disfavoredOverload
     @inline(__always)
-    private mutating func appendComment(_ s: consuming String) {
-        self.currentComment += s.unicodeScalars
+    private mutating func appendComment(_ s: consuming Str) {
+        self.currentComment += s
     }
 
     @inline(__always)
diff --git a/Sources/Tokenizer/macros.swift b/Sources/Tokenizer/macros.swift
index e22c48b..24fcf77 100644
--- a/Sources/Tokenizer/macros.swift
+++ b/Sources/Tokenizer/macros.swift
@@ -25,7 +25,7 @@
 @freestanding(codeItem) macro go(clearTemp: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(appendComment: Char) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(appendComment: Char, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
-@freestanding(codeItem) macro go(appendComment: String, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
+@freestanding(codeItem) macro go<S: ExpressibleByStringLiteral>(appendComment: S, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(clearComment: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(emitComment: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(createStartTag: Char, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
@@ -35,7 +35,6 @@
 @freestanding(codeItem) macro go(appendTagName: Char, appendTemp: Char) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(createAttr: Char, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(appendAttrName: Char) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
-@freestanding(codeItem) macro go(appendAttrName: Str) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(appendAttrValue: Char) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go<S: ExpressibleByStringLiteral>(appendAttrValue: S) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(emitTag: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
@@ -53,8 +52,8 @@
 @freestanding(codeItem) macro goEmitNewForceQuirksDOCTYPEAndEOF() = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro goConsumeCharRef(inAttr: Bool) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(error: ParseError, _: ParseError, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
-@freestanding(codeItem) macro go(error: ParseError, _: ParseError, createComment: String, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
-@freestanding(codeItem) macro go(error: ParseError, _: ParseError, appendComment: String, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
+@freestanding(codeItem) macro go(error: ParseError, _: ParseError, createComment: Str, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
+@freestanding(codeItem) macro go(error: ParseError, _: ParseError, appendComment: Str, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(error: ParseError, _: ParseError, createAttr: Char, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(error: ParseError, _: ParseError, createDOCTYPE: Char, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(error: ParseError, _: ParseError, forceQuirks: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
@@ -75,9 +74,9 @@
 @freestanding(codeItem) macro go(error: ParseError, emit: Token, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(error: ParseError, emit: Token, reconsume: Char, in: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(error: ParseError, createComment: Char, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
-@freestanding(codeItem) macro go(error: ParseError, createComment: String, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
+@freestanding(codeItem) macro go<S: ExpressibleByStringLiteral>(error: ParseError, createComment: S, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(error: ParseError, appendComment: Char) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
-@freestanding(codeItem) macro go(error: ParseError, appendComment: String, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
+@freestanding(codeItem) macro go<S: ExpressibleByStringLiteral>(error: ParseError, appendComment: S, to: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(error: ParseError, clearComment: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(error: ParseError, emitComment: State) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")
 @freestanding(codeItem) macro go(error: ParseError, appendTagName: Char) = #externalMacro(module: "TokenizerMacros", type: "GoMacro")