diff --git a/misc/codegen/templates/ql_class.mustache b/misc/codegen/templates/ql_class.mustache
index cb30fc791c79..39aba2b1ef4b 100644
--- a/misc/codegen/templates/ql_class.mustache
+++ b/misc/codegen/templates/ql_class.mustache
@@ -29,7 +29,15 @@ module Generated {
     /**
      * Gets the string representation of this element.
      */
-    string toString() { none() } // overridden by subclasses
+    cached
+    final string toString() { result = this.toStringImpl() }
+
+    /**
+     * INTERNAL: Do not use.
+     *
+     * Gets the string representation of this element.
+     */
+    abstract string toStringImpl();
 
     /**
      * Gets the name of a primary CodeQL class to which this element belongs.
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index 0ebf3ad12301..d7d2ef152dcb 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -504,7 +504,7 @@ lib/codeql/rust/elements/internal/generated/ConstParam.qll 310342603959a4d521418
 lib/codeql/rust/elements/internal/generated/ContinueExpr.qll e2010feb14fb6edeb83a991d9357e50edb770172ddfde2e8670b0d3e68169f28 48d09d661e1443002f6d22b8710e22c9c36d9daa9cde09c6366a61e960d717cb
 lib/codeql/rust/elements/internal/generated/Crate.qll 6d28f07d4ddaf077119590a007a8cfad0c86cf0efabbde689fb4092577b883df d43013163916aa83f281314a72d02d7566e1f505aa36cfd8060a760b06b02683
 lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll a9d540717af1f00dbea1c683fd6b846cddfb2968c7f3e021863276f123337787 1972efb9bca7aae9a9708ca6dcf398e5e8c6d2416a07d525dba1649b80fbe4d1
-lib/codeql/rust/elements/internal/generated/Element.qll fb483b636180c699181c8aff83bc471b2c416206694f7028c671015918547663 542d1b9ae80c997974c94db3655887186df3921a8fa3f565eaf292dcfdac3c4c
+lib/codeql/rust/elements/internal/generated/Element.qll 69ce882811f2bef7e0a93c0a24494dd16120a108ba4180d455344e29144a98c4 7781bc5c69b5b08775902fcb97cb23f85359ef2303545afe9d44301b19024b3a
 lib/codeql/rust/elements/internal/generated/Enum.qll 4f4cbc9cd758c20d476bc767b916c62ba434d1750067d0ffb63e0821bb95ec86 3da735d54022add50cec0217bbf8ec4cf29b47f4851ee327628bcdd6454989d0
 lib/codeql/rust/elements/internal/generated/Expr.qll 5fa34f2ed21829a1509417440dae42d416234ff43433002974328e7aabb8f30f 46f3972c7413b7db28a3ea8acb5a50a74b6dd9b658e8725f6953a8829ac912f8
 lib/codeql/rust/elements/internal/generated/ExprStmt.qll d1112230015fbeb216b43407a268dc2ccd0f9e0836ab2dca4800c51b38fa1d7d 4a80562dcc55efa5e72c6c3b1d6747ab44fe494e76faff2b8f6e9f10a4b08b5b
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprImpl.qll
index 8b22613dca3d..2f7b235f3236 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprImpl.qll
@@ -22,6 +22,6 @@ module Impl {
    * ```
    */
   class ArrayListExpr extends Generated::ArrayListExpr {
-    override string toString() { result = "[...]" }
+    override string toStringImpl() { result = "[...]" }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprImpl.qll
index 66e83a6badbb..5eb80cff113b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprImpl.qll
@@ -21,7 +21,7 @@ module Impl {
    * ```
    */
   class ArrayRepeatExpr extends Generated::ArrayRepeatExpr {
-    override string toString() {
+    override string toStringImpl() {
       result =
         "[" + this.getRepeatOperand().toAbbreviatedString() + "; " +
           this.getRepeatLength().toAbbreviatedString() + "]"
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
index d9aa0f8bf448..afaea37e4df5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
@@ -22,6 +22,6 @@ module Impl {
    * ```
    */
   class AwaitExpr extends Generated::AwaitExpr {
-    override string toString() { result = "await " + this.getExpr().toAbbreviatedString() }
+    override string toStringImpl() { result = "await " + this.getExpr().toAbbreviatedString() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll
index ded01ec4ef83..4844e5148285 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll
@@ -25,6 +25,6 @@ module Impl {
    * ```
    */
   class BecomeExpr extends Generated::BecomeExpr {
-    override string toString() { result = "become " + this.getExpr().toAbbreviatedString() }
+    override string toStringImpl() { result = "become " + this.getExpr().toAbbreviatedString() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
index 101295e5dc84..6aac95fcacee 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
@@ -23,6 +23,6 @@ module Impl {
    * ```
    */
   class BinaryExpr extends Generated::BinaryExpr {
-    override string toString() { result = "... " + this.getOperatorName() + " ..." }
+    override string toStringImpl() { result = "... " + this.getOperatorName() + " ..." }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
index 45870d14297b..94f528f4790b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
@@ -22,6 +22,6 @@ module Impl {
    * ```
    */
   class BoxPat extends Generated::BoxPat {
-    override string toString() { result = "box " + this.getPat().toAbbreviatedString() }
+    override string toStringImpl() { result = "box " + this.getPat().toAbbreviatedString() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
index d156e207150c..e884eb9277c2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
@@ -104,14 +104,14 @@ module Impl {
       )
     }
 
-    override string toString() {
+    override string toStringImpl() {
       result = strictconcat(int i | | this.toStringPart(i), " " order by i)
     }
 
     private string toStringPart(int index) {
       index = 0 and result = "break"
       or
-      index = 1 and result = this.getLifetime().toString()
+      index = 1 and result = this.getLifetime().toStringImpl()
       or
       index = 2 and result = this.getExpr().toAbbreviatedString()
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
index f26fd3109ea2..944185cf122e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
@@ -34,7 +34,7 @@ module Impl {
    * ```
    */
   class CallExpr extends Generated::CallExpr {
-    override string toString() { result = this.getFunction().toAbbreviatedString() + "(...)" }
+    override string toStringImpl() { result = this.getFunction().toAbbreviatedString() + "(...)" }
 
     override Callable getStaticTarget() { result = getResolvedFunction(this) }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
index b074e7379318..e3245102e9f3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class CastExpr extends Generated::CastExpr {
-    override string toString() {
+    override string toStringImpl() {
       result =
         this.getExpr().toAbbreviatedString() + " as " + this.getTypeRepr().toAbbreviatedString()
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
index 17e373290b50..e96ae47e3015 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
@@ -25,6 +25,6 @@ module Impl {
    * ```
    */
   class ClosureExpr extends Generated::ClosureExpr {
-    override string toString() { result = "|...| " + this.getBody().toAbbreviatedString() }
+    override string toStringImpl() { result = "|...| " + this.getBody().toAbbreviatedString() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
index 85b2a4d80d31..77972720b02f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
@@ -20,7 +20,7 @@ module Impl {
    * ```
    */
   class Comment extends Generated::Comment {
-    override string toString() {
+    override string toStringImpl() {
       result = this.getCommentMarker() + "..." + this.getCommentEndMarker()
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
index ecfcd1a48429..4f4bac4b985e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
@@ -49,7 +49,7 @@ module Impl {
    * ```
    */
   class ContinueExpr extends Generated::ContinueExpr {
-    override string toString() {
+    override string toStringImpl() {
       result = strictconcat(int i | | this.toStringPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CrateImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CrateImpl.qll
index d03aca69d338..1ce15fef0888 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CrateImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CrateImpl.qll
@@ -12,7 +12,9 @@ private import codeql.rust.elements.internal.generated.Crate
  */
 module Impl {
   class Crate extends Generated::Crate {
-    override string toString() { result = strictconcat(int i | | this.toStringPart(i) order by i) }
+    override string toStringImpl() {
+      result = strictconcat(int i | | this.toStringPart(i) order by i)
+    }
 
     private string toStringPart(int i) {
       i = 0 and result = "Crate("
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
index 9307a567b6e1..75de7703df02 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
@@ -12,13 +12,13 @@ private import codeql.rust.elements.internal.generated.Element
  */
 module Impl {
   class Element extends Generated::Element {
-    override string toString() { result = this.getAPrimaryQlClass() }
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
 
     /**
+     * INTERNAL: Do not use.
+     *
      * Returns a string suitable to be inserted into the name of the parent. Typically `"..."`,
      * but may be overridden by subclasses.
-     *
-     * INTERNAL: Do not use.
      */
     string toAbbreviatedString() { result = "..." }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
index 0299ce9f05e6..a298aa7319f2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class Enum extends Generated::Enum {
-    override string toString() { result = "enum " + this.getName().getText() }
+    override string toStringImpl() { result = "enum " + this.getName().getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll
index 0f98299c5754..8e62dab3df39 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll
@@ -12,7 +12,7 @@ private import codeql.rust.elements.internal.generated.ExtractorStep
  */
 module Impl {
   class ExtractorStep extends Generated::ExtractorStep {
-    override string toString() {
+    override string toStringImpl() {
       result = this.getAction() + "(" + this.getFile().getAbsolutePath() + ")"
       or
       not this.hasFile() and result = this.getAction()
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
index 18896c5b4e0f..58b8bc19bd16 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
@@ -28,7 +28,7 @@ module Impl {
     /** Gets the tuple field that this access references, if any. */
     TupleField getTupleField() { result = TypeInference::resolveTupleFieldExpr(this) }
 
-    override string toString() {
+    override string toStringImpl() {
       exists(string abbr, string name |
         abbr = this.getExpr().toAbbreviatedString() and
         name = this.getNameRef().getText() and
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll
index 6719d9d8cb3c..3ce8bf00304c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll
@@ -36,7 +36,7 @@ module Impl {
 
     FormatArgument() { this = Synth::TFormatArgument(parent, index, kind, name, _, offset) }
 
-    override string toString() { result = name }
+    override string toStringImpl() { result = name }
 
     override Format getParent() { result = Synth::TFormat(parent, index, _, _) }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll
index 58ae2cfe7920..ffb7b445a3ef 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll
@@ -36,7 +36,7 @@ module Impl {
 
     Format() { this = Synth::TFormat(parent, index, text, offset) }
 
-    override string toString() { result = text }
+    override string toStringImpl() { result = text }
 
     override FormatArgsExpr getParent() { result = Synth::convertFormatArgsExprFromRaw(parent) }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessImpl.qll
index cb17fa523617..adb12a359316 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessImpl.qll
@@ -29,7 +29,7 @@ module Impl {
 
     override Location getLocation() { result = argument.getLocation() }
 
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
 
     /** Gets the name of the variable */
     string getName() { result = argument.getName() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
index 791cf4f9d7fc..ca019bd01e22 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
@@ -25,6 +25,6 @@ module Impl {
    * ```
    */
   class Function extends Generated::Function {
-    override string toString() { result = "fn " + this.getName().getText() }
+    override string toStringImpl() { result = "fn " + this.getName().getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
index affe01e77478..eaba0f7ff6e8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
@@ -21,7 +21,7 @@ module Impl {
    * ```
    */
   class GenericArgList extends Generated::GenericArgList {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "<...>" }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll
index 704ce0e6daba..1ebb52e9a391 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll
@@ -21,7 +21,7 @@ module Impl {
    * ```
    */
   class GenericParamList extends Generated::GenericParamList {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "<...>" }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
index 4d82a9252293..416f1d8321b9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
@@ -28,7 +28,7 @@ module Impl {
    * ```
    */
   class IdentPat extends Generated::IdentPat {
-    override string toString() {
+    override string toStringImpl() {
       result = strictconcat(int i | | this.toStringPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
index c90ee6ccdc06..a245f5824faf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
@@ -28,7 +28,9 @@ module Impl {
    * ```
    */
   class IfExpr extends Generated::IfExpr {
-    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+    override string toStringImpl() {
+      result = concat(int i | | this.toStringPart(i), " " order by i)
+    }
 
     private string toStringPart(int index) {
       index = 0 and result = "if"
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
index c75c36b280b9..7b23a2e854ba 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class Impl extends Generated::Impl {
-    override string toString() {
+    override string toStringImpl() {
       exists(string trait |
         (
           trait = this.getTrait().toAbbreviatedString() + " for "
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
index 2ace04fe3899..66c33b4a0b19 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
@@ -20,7 +20,7 @@ module Impl {
    * ```
    */
   class IndexExpr extends Generated::IndexExpr {
-    override string toString() {
+    override string toStringImpl() {
       result =
         this.getBase().toAbbreviatedString() + "[" + this.getIndex().toAbbreviatedString() + "]"
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll
index 32144265f0ce..1df33c2c3ccf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class InferTypeRepr extends Generated::InferTypeRepr {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "_" }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll
index 822029bf3a73..1b2f487192f2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class Label extends Generated::Label {
-    override string toString() { result = this.getText() }
+    override string toStringImpl() { result = this.getText() }
 
     override string toAbbreviatedString() { result = this.getText() }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LabelableExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LabelableExprImpl.qll
index 070481817145..e47625e50c98 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LabelableExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LabelableExprImpl.qll
@@ -16,7 +16,7 @@ module Impl {
    * The base class for expressions that can be labeled (`LoopExpr`, `ForExpr`, `WhileExpr` or `BlockExpr`).
    */
   class LabelableExpr extends Generated::LabelableExpr {
-    final override string toString() {
+    final override string toStringImpl() {
       result = strictconcat(int i | | this.toStringPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
index 0ca4e58fb850..11643dcbcb48 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class LetElse extends Generated::LetElse {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "else {...}" }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll
index b690f2b044b7..64dfc604e6fb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll
@@ -21,7 +21,9 @@ module Impl {
    * ```
    */
   class LetExpr extends Generated::LetExpr {
-    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+    override string toStringImpl() {
+      result = concat(int i | | this.toStringPart(i), " " order by i)
+    }
 
     private string toStringPart(int index) {
       index = 0 and result = "let"
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
index d612c2082a64..5a0a910ef835 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
@@ -26,7 +26,7 @@ module Impl {
    * ```
    */
   class LetStmt extends Generated::LetStmt {
-    override string toString() {
+    override string toStringImpl() {
       result = strictconcat(int i | | this.toStringPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
index 27b29f64cc9e..08bc22901fe8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class Lifetime extends Generated::Lifetime {
-    override string toString() {
+    override string toStringImpl() {
       result = "'" + this.getText()
       or
       not this.hasText() and result = "'_"
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
index f68c79da16b1..6a8d02d9380e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
@@ -26,7 +26,7 @@ module Impl {
    * ```
    */
   class LiteralExpr extends Generated::LiteralExpr {
-    override string toString() { result = this.getTrimmedText() }
+    override string toStringImpl() { result = this.getTrimmedText() }
 
     override string toAbbreviatedString() { result = this.getTrimmedText() }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
index 1c59c3fa284a..e5b55a79e035 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class LiteralPat extends Generated::LiteralPat {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = this.getLiteral().getTrimmedText() }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
index a34d64c0735e..c28d08f540b1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class MacroCall extends Generated::MacroCall {
-    override string toString() { result = this.getPath().toAbbreviatedString() + "!..." }
+    override string toStringImpl() { result = this.getPath().toAbbreviatedString() + "!..." }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
index 23ad2551bffc..d2bf1c5b6919 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
@@ -28,7 +28,9 @@ module Impl {
    * ```
    */
   class MatchArm extends Generated::MatchArm {
-    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+    override string toStringImpl() {
+      result = concat(int i | | this.toStringPart(i), " " order by i)
+    }
 
     private string toStringPart(int index) {
       index = 0 and result = this.getPat().toAbbreviatedString()
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
index 15fdcf7e73fb..3740eca4eb02 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
@@ -28,7 +28,7 @@ module Impl {
    * ```
    */
   class MatchExpr extends Generated::MatchExpr {
-    override string toString() {
+    override string toStringImpl() {
       result = "match " + this.getScrutinee().toAbbreviatedString() + " { ... }"
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
index bc8dfaabb198..5493c9374f2f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
@@ -42,11 +42,11 @@ module Impl {
       )
     }
 
-    override string toString() {
+    override string toStringImpl() {
       exists(string base, string separator |
         base = this.getReceiver().toAbbreviatedString() and
         (if base = "..." then separator = " ." else separator = ".") and
-        result = base + separator + this.getNameRef().toString() + "(...)"
+        result = base + separator + this.getNameRef().toStringImpl() + "(...)"
       )
     }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
index 505495862b7f..0fb9690d2d1d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
@@ -24,6 +24,6 @@ module Impl {
    * ```
    */
   class Module extends Generated::Module {
-    override string toString() { result = "mod " + this.getName() }
+    override string toStringImpl() { result = "mod " + this.getName() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll
index 43642a03886f..95e2fba90123 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class Name extends Generated::Name {
-    override string toString() { result = this.getText() }
+    override string toStringImpl() { result = this.getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
index 9f5f3eac48eb..373790de6e4c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class NameRef extends Generated::NameRef {
-    override string toString() { result = this.getText() }
+    override string toStringImpl() { result = this.getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll
index b5a7a7258805..aff4282dadbc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class NeverTypeRepr extends Generated::NeverTypeRepr {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "!" }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
index 07cc59f0ddee..1dde17531ede 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
@@ -21,7 +21,7 @@ module Impl {
    * ```
    */
   class OrPat extends Generated::OrPat {
-    override string toString() {
+    override string toStringImpl() {
       result = concat(int i | | this.getPat(i).toAbbreviatedString(), " | " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
index a76b805f9515..d3e4522e6dcf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
@@ -21,7 +21,7 @@ module Impl {
    * ```
    */
   class Param extends Generated::Param {
-    override string toString() { result = concat(int i | | this.toStringPart(i) order by i) }
+    override string toStringImpl() { result = concat(int i | | this.toStringPart(i) order by i) }
 
     private string toStringPart(int index) {
       index = 0 and result = this.getPat().toAbbreviatedString()
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
index db9d19f5650b..42490c5c1cf3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class ParenExpr extends Generated::ParenExpr {
-    override string toString() { result = "(" + this.getExpr().toAbbreviatedString() + ")" }
+    override string toStringImpl() { result = "(" + this.getExpr().toAbbreviatedString() + ")" }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
index 9d9016cff98e..a4c6873f214d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class ParenPat extends Generated::ParenPat {
-    override string toString() { result = "(" + this.getPat().toAbbreviatedString() + ")" }
+    override string toStringImpl() { result = "(" + this.getPat().toAbbreviatedString() + ")" }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
index 5c06b951c19d..98a4ae9b31cd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class ParenTypeRepr extends Generated::ParenTypeRepr {
-    override string toString() { result = "(" + this.getTypeRepr().toAbbreviatedString() + ")" }
+    override string toStringImpl() { result = "(" + this.getTypeRepr().toAbbreviatedString() + ")" }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
index 0d7b29edabee..652dc68b3c9c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
@@ -22,8 +22,8 @@ module Impl {
    * ```
    */
   class PathExpr extends Generated::PathExpr {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
-    override string toAbbreviatedString() { result = this.getPath().toString() }
+    override string toAbbreviatedString() { result = this.getPath().toStringImpl() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
index fd43b3b79f21..285b423331da 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
@@ -20,12 +20,19 @@ module Impl {
    * ```
    */
   class Path extends Generated::Path {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() {
-      if this.hasQualifier()
-      then result = "...::" + this.getPart().toAbbreviatedString()
-      else result = this.getPart().toAbbreviatedString()
+      result = strictconcat(int i | | this.toAbbreviatedStringPart(i) order by i)
+    }
+
+    private string toAbbreviatedStringPart(int index) {
+      index = 0 and
+      this.hasQualifier() and
+      result = "...::"
+      or
+      index = 1 and
+      result = this.getPart().toAbbreviatedString()
     }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
index 27914a8f4159..fb1e072b4e25 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class PathPat extends Generated::PathPat {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = this.getPath().toAbbreviatedString() }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
index 6d585d61efca..d13b42ee9148 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
@@ -16,7 +16,7 @@ module Impl {
    * A path segment, which is one part of a whole path.
    */
   class PathSegment extends Generated::PathSegment {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() {
       result = strictconcat(int i | | this.toAbbreviatedStringPart(i), "::" order by i)
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll
index fb1e8cd380ed..cadb690afe86 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll
@@ -20,7 +20,7 @@ module Impl {
    * ```
    */
   class PathTypeRepr extends Generated::PathTypeRepr {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = this.getPath().toAbbreviatedString() }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
index 56fd5914660e..bf77c7b88ea4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
@@ -21,6 +21,6 @@ module Impl {
    * ```
    */
   class PrefixExpr extends Generated::PrefixExpr {
-    override string toString() { result = this.getOperatorName() + " ..." }
+    override string toStringImpl() { result = this.getOperatorName() + " ..." }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
index 3b8989af7821..fa8afac50090 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
@@ -24,7 +24,7 @@ module Impl {
    * ```
    */
   class RangeExpr extends Generated::RangeExpr {
-    override string toString() { result = concat(int i | | this.toStringPart(i) order by i) }
+    override string toStringImpl() { result = concat(int i | | this.toStringPart(i) order by i) }
 
     private string toStringPart(int index) {
       index = 0 and result = this.getStartAbbreviation()
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll
index 1a2a8f72348e..9c67a45286bc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class RecordExprField extends Generated::RecordExprField {
-    override string toString() { result = concat(int i | | this.toStringPart(i) order by i) }
+    override string toStringImpl() { result = concat(int i | | this.toStringPart(i) order by i) }
 
     private string toStringPart(int index) {
       index = 0 and result = this.getNameRef().getText()
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll
index ae8717f49dd8..764aa3c21cc5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll
@@ -25,7 +25,7 @@ module Impl {
    * ```
    */
   class RecordExpr extends Generated::RecordExpr {
-    override string toString() { result = this.getPath().toString() + " {...}" }
+    override string toStringImpl() { result = this.getPath().toStringImpl() + " {...}" }
 
     /** Gets the record expression for the field `name`. */
     pragma[nomagic]
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll
index ecf4152a1e06..a5cd587c1c7a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll
@@ -21,7 +21,7 @@ module Impl {
    * ```
    */
   class RecordPatField extends Generated::RecordPatField {
-    override string toString() { result = concat(int i | | this.toStringPart(i) order by i) }
+    override string toStringImpl() { result = concat(int i | | this.toStringPart(i) order by i) }
 
     private string toStringPart(int index) {
       index = 0 and result = this.getNameRef().getText()
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll
index 02ea4726df6a..708e42a5efcc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll
@@ -25,7 +25,7 @@ module Impl {
    * ```
    */
   class RecordPat extends Generated::RecordPat {
-    override string toString() { result = this.getPath().toAbbreviatedString() + " {...}" }
+    override string toStringImpl() { result = this.getPath().toAbbreviatedString() + " {...}" }
 
     pragma[nomagic]
     private PathResolution::ItemNode getResolvedPath(string name) {
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
index 4ec593362d95..83f32d892fbb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class RefExpr extends Generated::RefExpr {
-    override string toString() {
+    override string toStringImpl() {
       result = "&" + concat(int i | | this.getSpecPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
index d6b1f4c27092..489b0550d93b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class RefPat extends Generated::RefPat {
-    override string toString() {
+    override string toStringImpl() {
       result = "&" + concat(int i | | this.getSpecPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
index ec7d48a4d9d7..e0fd26aae805 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class RestPat extends Generated::RestPat {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = ".." }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
index 1b632587867e..d18aec8f40da 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
@@ -26,7 +26,9 @@ module Impl {
    * ```
    */
   class ReturnExpr extends Generated::ReturnExpr {
-    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+    override string toStringImpl() {
+      result = concat(int i | | this.toStringPart(i), " " order by i)
+    }
 
     private string toStringPart(int index) {
       index = 0 and result = "return"
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
index 414dec3f06bb..ae53e95a9b69 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
@@ -20,7 +20,7 @@ module Impl {
    * ```
    */
   class Struct extends Generated::Struct {
-    override string toString() { result = "struct " + this.getName().getText() }
+    override string toStringImpl() { result = "struct " + this.getName().getText() }
 
     /** Gets the record field named `name`, if any. */
     pragma[nomagic]
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
index 564e54e78d64..63a136734652 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
@@ -25,6 +25,6 @@ module Impl {
    * ```
    */
   class Trait extends Generated::Trait {
-    override string toString() { result = "trait " + this.getName().getText() }
+    override string toStringImpl() { result = "trait " + this.getName().getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll
index 4120762db7ba..d7d4f02f81e4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll
@@ -26,7 +26,7 @@ module Impl {
    * ```
    */
   class TupleStructPat extends Generated::TupleStructPat {
-    override string toString() { result = this.getPath().toAbbreviatedString() + "(...)" }
+    override string toStringImpl() { result = this.getPath().toAbbreviatedString() + "(...)" }
 
     pragma[nomagic]
     private PathResolution::ItemNode getResolvedPath(int pos) {
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
index 09fb7f4b33de..8358afe24296 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
@@ -26,6 +26,6 @@ module Impl {
 
     override string toAbbreviatedString() { result = this.getName().getText() }
 
-    override string toString() { result = this.getName().getText() }
+    override string toStringImpl() { result = this.getName().getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
index 620a09e8c3d9..5a7a9ae617ca 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class UnderscoreExpr extends Generated::UnderscoreExpr {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "_" }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
index 15a793741172..a99b1a7574c1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class Union extends Generated::Union {
-    override string toString() { result = "union " + this.getName().getText() }
+    override string toStringImpl() { result = "union " + this.getName().getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 2b842a8fab9d..44d060c98233 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -594,7 +594,7 @@ module Impl {
     /** Holds if this access is a capture. */
     predicate isCapture() { this.getEnclosingCfgScope() != v.getEnclosingCfgScope() }
 
-    override string toString() { result = name }
+    override string toStringImpl() { result = name }
 
     override string getAPrimaryQlClass() { result = "VariableAccess" }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
index 6e03f779de55..65678d2ee6ed 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
@@ -20,7 +20,7 @@ module Impl {
    * ```
    */
   class Variant extends Generated::Variant {
-    override string toString() { result = this.getName().getText() }
+    override string toStringImpl() { result = this.getName().getText() }
 
     /** Gets the record field named `name`, if any. */
     pragma[nomagic]
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
index f1a8fa1a72ee..30341bf8496a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class WildcardPat extends Generated::WildcardPat {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "_" }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Element.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Element.qll
index 1733d21c6122..f8a5f4b24b21 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Element.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Element.qll
@@ -23,7 +23,15 @@ module Generated {
     /**
      * Gets the string representation of this element.
      */
-    string toString() { none() } // overridden by subclasses
+    cached
+    final string toString() { result = this.toStringImpl() }
+
+    /**
+     * INTERNAL: Do not use.
+     *
+     * Gets the string representation of this element.
+     */
+    abstract string toStringImpl();
 
     /**
      * Gets the name of a primary CodeQL class to which this element belongs.
diff --git a/swift/ql/.generated.list b/swift/ql/.generated.list
index 6c086a490ad9..900d0381032e 100644
--- a/swift/ql/.generated.list
+++ b/swift/ql/.generated.list
@@ -701,7 +701,7 @@ lib/codeql/swift/generated/Comment.qll 64625f47ebddb1ec7e1c81790dd8120087a76958c
 lib/codeql/swift/generated/DbFile.qll cc0d2b9efbee36080bde2e26e424a40efb763eaee55874fb6c4a5db36938f3df 33e215d838cfa36e3dd0e62879e896d988430d1470a87ce1bb45aad70886212b
 lib/codeql/swift/generated/DbLocation.qll e2c7cc975b53cfb0061e055da082fbe57c0aef388e5ee874f0ff22c388a81ce1 1939414bc5d574796e83ab916408c3183210ead04957b50493610529700e0427
 lib/codeql/swift/generated/Diagnostics.qll 03ea201db80d33b18f7f6c71267044c695c2572e5783ab754fa7c7ac27e16ee3 8aa78be37a8f23e4b899b910508fd5966ebc98fade6c284d59d59e246de18288
-lib/codeql/swift/generated/Element.qll 129b5fedbb36bf9157fe8fa9388e7afeb11f73c3b850b100a08b564f993b067d eebbbac92d5ea5116cd575eb9b8e26d3ff7e5e35de648f37cab586a3191b413f
+lib/codeql/swift/generated/Element.qll ee383d0b3be3ae1f58142980011476ce6f317550f96548403f9ecd352ee72cd9 ef4a8e175d327b44b147814ad9630ca54c53f21fc2bab7d8a88d1e220060c0a7
 lib/codeql/swift/generated/ErrorElement.qll b39bd7c8b4e2011f4a6889e073ebf5b628db32f36f50b067250ae730d9f26561 fd859ec969ba434049e7ba4e78271cc8cebc8b058d2e96e4d47a22064cbb5a21
 lib/codeql/swift/generated/File.qll 476ac95566ef0080e0ad8c3da144b1be1d945d2f33a24f0864d85ff7c56a09b1 3134018bb50166cbf2690f64bba551cace350e4a7e6e25bcded18f997ad1835b
 lib/codeql/swift/generated/KeyPathComponent.qll 5276acdc9a4ff0ec0cc8af615c04043391fb99613731ddcc86db4e47b37c8c5a ccc0931bbd6cc2cfae5037c2ee17bbdcbd87536f5fed90d07e73065c016c4382
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll
index 9a16c993b1eb..bdbd96f2cf74 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll
@@ -25,11 +25,11 @@ module Impl {
       this instanceof WillSetObserver or this instanceof DidSetObserver
     }
 
-    override string toString() {
+    override string toStringImpl() {
       isKnownAccessorKind(this, result)
       or
       not isKnownAccessorKind(this, _) and
-      result = super.toString()
+      result = super.toStringImpl()
     }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/CapturedDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/CapturedDeclImpl.qll
index 0d07f7c6eee2..188e0102929d 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/CapturedDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/CapturedDeclImpl.qll
@@ -7,7 +7,7 @@ module Impl {
    * A captured variable or function parameter in the scope of a closure.
    */
   class CapturedDecl extends Generated::CapturedDecl {
-    override string toString() { result = this.getDecl().toString() }
+    override string toStringImpl() { result = this.getDecl().toStringImpl() }
 
     /**
      * Gets the closure or function that captures this variable.
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/DeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/DeclImpl.qll
index eb05a3b25b5e..3acbbc668513 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/DeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/DeclImpl.qll
@@ -4,7 +4,8 @@ private import codeql.swift.elements.decl.ExtensionDecl
 
 module Impl {
   class Decl extends Generated::Decl {
-    override string toString() { result = super.toString() }
+    // needed to avoid spurious non-monotonicity error
+    override string toStringImpl() { result = super.toStringImpl() }
 
     /**
      * Gets the `NominalTypeDecl` corresponding to this `Decl`, if any. This
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/DeinitializerImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/DeinitializerImpl.qll
index c46bb3867d27..ea074878bfe9 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/DeinitializerImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/DeinitializerImpl.qll
@@ -6,6 +6,8 @@ module Impl {
    * A deinitializer of a class.
    */
   class Deinitializer extends Generated::Deinitializer {
-    override string toString() { result = this.getSelfParam().getType() + "." + super.toString() }
+    override string toStringImpl() {
+      result = this.getSelfParam().getType().toStringImpl() + "." + super.toStringImpl()
+    }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumCaseDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumCaseDeclImpl.qll
index 8e2ea03a70d6..08efa75ce6d7 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumCaseDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumCaseDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.EnumCaseDecl
 
 module Impl {
   class EnumCaseDecl extends Generated::EnumCaseDecl {
-    override string toString() { result = "case ..." }
+    override string toStringImpl() { result = "case ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumElementDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumElementDeclImpl.qll
index d2234b9a0f98..ffd3898cb143 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumElementDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumElementDeclImpl.qll
@@ -12,7 +12,7 @@ module Impl {
    * ```
    */
   class EnumElementDecl extends Generated::EnumElementDecl {
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
 
     /**
      * Holds if this enum element declaration is called `enumElementName` and is a member of an
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/ExtensionDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/ExtensionDeclImpl.qll
index 1d31a99a5357..57c02190006c 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/ExtensionDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/ExtensionDeclImpl.qll
@@ -2,9 +2,10 @@ private import codeql.swift.generated.decl.ExtensionDecl
 
 module Impl {
   class ExtensionDecl extends Generated::ExtensionDecl {
-    override string toString() {
+    override string toStringImpl() {
       result =
-        "extension of " + unique(NominalTypeDecl td | td = this.getExtendedTypeDecl()).toString()
+        "extension of " +
+          unique(NominalTypeDecl td | td = this.getExtendedTypeDecl()).toStringImpl()
       or
       count(this.getExtendedTypeDecl()) != 1 and
       result = "extension"
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/FunctionImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/FunctionImpl.qll
index 054b0b81e50b..f0f1f4a1b438 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/FunctionImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/FunctionImpl.qll
@@ -6,7 +6,7 @@ module Impl {
    * A function.
    */
   class Function extends Generated::Function {
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
 
     /**
      * Gets the name of this function, without the argument list. For example
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/IfConfigDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/IfConfigDeclImpl.qll
index 395409992d5a..1c867c19f8b1 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/IfConfigDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/IfConfigDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.IfConfigDecl
 
 module Impl {
   class IfConfigDecl extends Generated::IfConfigDecl {
-    override string toString() { result = "#if ..." }
+    override string toStringImpl() { result = "#if ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/ImportDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/ImportDeclImpl.qll
index 2e0aa369bd17..26107ec1d4aa 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/ImportDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/ImportDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.ImportDecl
 
 module Impl {
   class ImportDecl extends Generated::ImportDecl {
-    override string toString() { result = "import ..." }
+    override string toStringImpl() { result = "import ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/InitializerImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/InitializerImpl.qll
index 662c7c4b1fb0..3a7b024cdf22 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/InitializerImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/InitializerImpl.qll
@@ -9,7 +9,9 @@ module Impl {
    * An initializer of a class, struct, enum or protocol.
    */
   class Initializer extends Generated::Initializer, MethodImpl::Method {
-    override string toString() { result = this.getSelfParam().getType() + "." + super.toString() }
+    override string toStringImpl() {
+      result = this.getSelfParam().getType().toStringImpl() + "." + super.toStringImpl()
+    }
 
     /** Holds if this initializer returns an optional type. Failable initializers are written as `init?`. */
     predicate isFailable() {
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/MissingMemberDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/MissingMemberDeclImpl.qll
index 51c9744ceea8..d53d17518d9f 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/MissingMemberDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/MissingMemberDeclImpl.qll
@@ -6,6 +6,6 @@ module Impl {
    * A placeholder for missing declarations that can arise on object deserialization.
    */
   class MissingMemberDecl extends Generated::MissingMemberDecl {
-    override string toString() { result = this.getName() + " (missing)" }
+    override string toStringImpl() { result = this.getName() + " (missing)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/OperatorDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/OperatorDeclImpl.qll
index cee4d691c89f..0fc35aaf607b 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/OperatorDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/OperatorDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.OperatorDecl
 
 module Impl {
   class OperatorDecl extends Generated::OperatorDecl {
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/PatternBindingDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/PatternBindingDeclImpl.qll
index 5cca53c3d482..3289420617a8 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/PatternBindingDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/PatternBindingDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.PatternBindingDecl
 
 module Impl {
   class PatternBindingDecl extends Generated::PatternBindingDecl {
-    override string toString() { result = "var ... = ..." }
+    override string toStringImpl() { result = "var ... = ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/PoundDiagnosticDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/PoundDiagnosticDeclImpl.qll
index b7e9caab00ae..fe175b4ea04f 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/PoundDiagnosticDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/PoundDiagnosticDeclImpl.qll
@@ -6,7 +6,7 @@ module Impl {
    * A diagnostic directive, which is either `#error` or `#warning`.
    */
   class PoundDiagnosticDecl extends Generated::PoundDiagnosticDecl {
-    override string toString() {
+    override string toStringImpl() {
       this.isError() and result = "#error(...)"
       or
       this.isWarning() and result = "#warning(...)"
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/PrecedenceGroupDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/PrecedenceGroupDeclImpl.qll
index 1f85a0d563d3..baa7ed3d5b56 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/PrecedenceGroupDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/PrecedenceGroupDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.PrecedenceGroupDecl
 
 module Impl {
   class PrecedenceGroupDecl extends Generated::PrecedenceGroupDecl {
-    override string toString() { result = "precedencegroup ..." }
+    override string toStringImpl() { result = "precedencegroup ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/SubscriptDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/SubscriptDeclImpl.qll
index 32a963340544..13eea583f93c 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/SubscriptDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/SubscriptDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.SubscriptDecl
 
 module Impl {
   class SubscriptDecl extends Generated::SubscriptDecl {
-    override string toString() { result = "subscript ..." }
+    override string toStringImpl() { result = "subscript ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/TopLevelCodeDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/TopLevelCodeDeclImpl.qll
index f3f8e0683be2..77e0a168a9ac 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/TopLevelCodeDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/TopLevelCodeDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.TopLevelCodeDecl
 
 module Impl {
   class TopLevelCodeDecl extends Generated::TopLevelCodeDecl {
-    override string toString() { result = this.getBody().toString() }
+    override string toStringImpl() { result = this.getBody().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/TypeDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/TypeDeclImpl.qll
index 1ddadd790ffe..d47742cab1ed 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/TypeDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/TypeDeclImpl.qll
@@ -18,7 +18,7 @@ module Impl {
    * have type declarations.
    */
   class TypeDecl extends Generated::TypeDecl {
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
 
     /**
      * Gets the `index`th base type of this type declaration (0-based).
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/VarDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/VarDeclImpl.qll
index 0a28fec7e57c..8a3ef866e1b6 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/VarDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/VarDeclImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * * ...
    */
   class VarDecl extends Generated::VarDecl {
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
   }
 
   /**
diff --git a/swift/ql/lib/codeql/swift/elements/expr/InitializerLookupExpr.qll b/swift/ql/lib/codeql/swift/elements/expr/InitializerLookupExpr.qll
index 961a2d9a5a88..54958639b806 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/InitializerLookupExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/InitializerLookupExpr.qll
@@ -5,7 +5,7 @@ private import codeql.swift.elements.decl.Initializer
 final private class InitializerLookupExprImpl extends Impl::MethodLookupExpr {
   InitializerLookupExprImpl() { super.getMethod() instanceof Initializer }
 
-  override string toString() { result = this.getMember().toString() }
+  override string toStringImpl() { result = this.getMember().toString() }
 }
 
 final class InitializerLookupExpr extends MethodLookupExpr, InitializerLookupExprImpl {
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ApplyExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ApplyExprImpl.qll
index ec5b88b6bf32..87a2f9481c8e 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ApplyExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ApplyExprImpl.qll
@@ -21,8 +21,8 @@ module Impl {
       result.getLabel() = label
     }
 
-    override string toString() {
-      result = "call to " + this.getStaticTarget().toString()
+    override string toStringImpl() {
+      result = "call to " + this.getStaticTarget().toStringImpl()
       or
       not exists(this.getStaticTarget()) and
       result = "call to ..."
@@ -48,7 +48,7 @@ module Impl {
 
     override Expr getQualifier() { result = expr.getQualifier() }
 
-    override string toString() { result = "call to " + expr }
+    override string toStringImpl() { result = "call to " + expr }
   }
 
   private class FullDotSyntaxBaseIgnoredApplyExpr extends ApplyExpr {
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ArgumentImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ArgumentImpl.qll
index dd46a84a21d3..944f11489211 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ArgumentImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ArgumentImpl.qll
@@ -3,7 +3,9 @@ private import codeql.swift.elements.expr.ApplyExpr
 
 module Impl {
   class Argument extends Generated::Argument {
-    override string toString() { result = this.getLabel() + ": " + this.getExpr().toString() }
+    override string toStringImpl() {
+      result = this.getLabel() + ": " + this.getExpr().toStringImpl()
+    }
 
     int getIndex() { any(ApplyExpr apply).getArgument(result) = this }
 
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ArrayExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ArrayExprImpl.qll
index e2b04c7c0176..d8d50c168c2b 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ArrayExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ArrayExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ArrayExpr
 
 module Impl {
   class ArrayExpr extends Generated::ArrayExpr {
-    override string toString() { result = "[...]" }
+    override string toStringImpl() { result = "[...]" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/AssignExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/AssignExprImpl.qll
index a77c7e0b6f80..d7194fd3f8d2 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/AssignExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/AssignExprImpl.qll
@@ -48,7 +48,7 @@ module Impl {
    * ```
    */
   class AssignExpr extends Generated::AssignExpr {
-    override string toString() { result = " ... = ..." }
+    override string toStringImpl() { result = " ... = ..." }
   }
 
   private class AssignExprAssignment extends Assignment instanceof AssignExpr {
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/AutoClosureExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/AutoClosureExprImpl.qll
index 69633e2dcc7f..a2aea3a73209 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/AutoClosureExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/AutoClosureExprImpl.qll
@@ -27,6 +27,6 @@ module Impl {
      */
     Expr getExpr() { result = this.getReturn().getResult() }
 
-    override string toString() { result = this.getBody().toString() }
+    override string toStringImpl() { result = this.getBody().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/AwaitExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/AwaitExprImpl.qll
index afae7e0bc5bc..d5ba9381a466 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/AwaitExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/AwaitExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.AwaitExpr
 
 module Impl {
   class AwaitExpr extends Generated::AwaitExpr {
-    override string toString() { result = "await ..." }
+    override string toStringImpl() { result = "await ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/BinaryExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/BinaryExprImpl.qll
index e823c08375d8..2210bc58526d 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/BinaryExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/BinaryExprImpl.qll
@@ -31,7 +31,7 @@ module Impl {
      */
     Expr getAnOperand() { result = [this.getLeftOperand(), this.getRightOperand()] }
 
-    override string toString() { result = "... " + this.getFunction().toString() + " ..." }
+    override string toStringImpl() { result = "... " + this.getFunction().toStringImpl() + " ..." }
 
     override Function getStaticTarget() { result = super.getStaticTarget() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/BindOptionalExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/BindOptionalExprImpl.qll
index 3a50de5166e0..d72dbe25e6cc 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/BindOptionalExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/BindOptionalExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.BindOptionalExpr
 
 module Impl {
   class BindOptionalExpr extends Generated::BindOptionalExpr {
-    override string toString() { result = "...?" }
+    override string toStringImpl() { result = "...?" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/BooleanLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/BooleanLiteralExprImpl.qll
index abb23239bb2e..e0dc9a4c3029 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/BooleanLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/BooleanLiteralExprImpl.qll
@@ -8,7 +8,7 @@ module Impl {
    * ```
    */
   class BooleanLiteralExpr extends Generated::BooleanLiteralExpr {
-    override string toString() { result = this.getValue().toString() }
+    override string toStringImpl() { result = this.getValue().toString() }
 
     override string getValueString() { result = this.getValue().toString() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/CaptureListExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/CaptureListExprImpl.qll
index 05cb4ff9725e..2725488d9d97 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/CaptureListExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/CaptureListExprImpl.qll
@@ -3,7 +3,7 @@ private import codeql.swift.elements.pattern.NamedPattern
 
 module Impl {
   class CaptureListExpr extends Generated::CaptureListExpr {
-    override string toString() { result = this.getClosureBody().toString() }
+    override string toStringImpl() { result = this.getClosureBody().toStringImpl() }
 
     override VarDecl getVariable(int index) {
       // all capture binding declarations consist of a single named pattern
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ClosureExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ClosureExprImpl.qll
index 198f22c32e01..4a4ab3b67597 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ClosureExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ClosureExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ClosureExpr
 
 module Impl {
   class ClosureExpr extends Generated::ClosureExpr {
-    override string toString() { result = "{ ... }" }
+    override string toStringImpl() { result = "{ ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DeclRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DeclRefExprImpl.qll
index 0429b6161307..01aa81fed04e 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DeclRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DeclRefExprImpl.qll
@@ -6,9 +6,9 @@ module Impl {
    * An expression that references or accesses a declaration.
    */
   class DeclRefExpr extends Generated::DeclRefExpr {
-    override string toString() {
-      if exists(this.getDecl().toString())
-      then result = this.getDecl().toString()
+    override string toStringImpl() {
+      if exists(this.getDecl().toStringImpl())
+      then result = this.getDecl().toStringImpl()
       else result = "(unknown declaration)"
     }
 
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DefaultArgumentExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DefaultArgumentExprImpl.qll
index 21481301dfb9..553cda549c07 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DefaultArgumentExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DefaultArgumentExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DefaultArgumentExpr
 
 module Impl {
   class DefaultArgumentExpr extends Generated::DefaultArgumentExpr {
-    override string toString() { result = "default " + this.getParamDecl().getName() }
+    override string toStringImpl() { result = "default " + this.getParamDecl().getName() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DictionaryExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DictionaryExprImpl.qll
index 92517497864d..c324fadb8079 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DictionaryExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DictionaryExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DictionaryExpr
 
 module Impl {
   class DictionaryExpr extends Generated::DictionaryExpr {
-    override string toString() { result = "[...]" }
+    override string toStringImpl() { result = "[...]" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DiscardAssignmentExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DiscardAssignmentExprImpl.qll
index 5516e13db11d..22b9c5f025e7 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DiscardAssignmentExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DiscardAssignmentExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DiscardAssignmentExpr
 
 module Impl {
   class DiscardAssignmentExpr extends Generated::DiscardAssignmentExpr {
-    override string toString() { result = "_" }
+    override string toStringImpl() { result = "_" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DotSelfExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DotSelfExprImpl.qll
index b9652363eb3b..d1f75b8de1ee 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DotSelfExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DotSelfExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DotSelfExpr
 
 module Impl {
   class DotSelfExpr extends Generated::DotSelfExpr {
-    override string toString() { result = ".self" }
+    override string toStringImpl() { result = ".self" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DotSyntaxBaseIgnoredExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DotSyntaxBaseIgnoredExprImpl.qll
index 3e9a72b37e04..5df2083e2759 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DotSyntaxBaseIgnoredExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DotSyntaxBaseIgnoredExprImpl.qll
@@ -16,13 +16,13 @@ module Impl {
    * which in turn can be accessed using the `getSubExpr/0` predicate.
    */
   class DotSyntaxBaseIgnoredExpr extends Generated::DotSyntaxBaseIgnoredExpr {
-    override string toString() {
+    override string toStringImpl() {
       result =
         any(string base |
-            if exists(this.getQualifier().(TypeExpr).getTypeRepr().toString())
-            then base = this.getQualifier().(TypeExpr).getTypeRepr().toString() + "."
+            if exists(this.getQualifier().(TypeExpr).getTypeRepr().toStringImpl())
+            then base = this.getQualifier().(TypeExpr).getTypeRepr().toStringImpl() + "."
             else base = "."
-          ) + this.getMethod()
+          ) + this.getMethod().toStringImpl()
     }
 
     /**
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicMemberRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicMemberRefExprImpl.qll
index 7f03f564d0fa..06e2bc54af19 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicMemberRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicMemberRefExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DynamicMemberRefExpr
 
 module Impl {
   class DynamicMemberRefExpr extends Generated::DynamicMemberRefExpr {
-    override string toString() { result = "." + this.getMember().toString() }
+    override string toStringImpl() { result = "." + this.getMember().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicSubscriptExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicSubscriptExprImpl.qll
index fd18ae9f5679..dc583cc3197c 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicSubscriptExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicSubscriptExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DynamicSubscriptExpr
 
 module Impl {
   class DynamicSubscriptExpr extends Generated::DynamicSubscriptExpr {
-    override string toString() { result = this.getMember().toString() + "[...]" }
+    override string toStringImpl() { result = this.getMember().toStringImpl() + "[...]" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicTypeExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicTypeExprImpl.qll
index 2ed7a8734e22..6ada598e4213 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicTypeExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicTypeExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DynamicTypeExpr
 
 module Impl {
   class DynamicTypeExpr extends Generated::DynamicTypeExpr {
-    override string toString() { result = "type(of: ...)" }
+    override string toStringImpl() { result = "type(of: ...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/EnumIsCaseExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/EnumIsCaseExprImpl.qll
index 941591e77fa6..f154944f5734 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/EnumIsCaseExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/EnumIsCaseExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.EnumIsCaseExpr
 
 module Impl {
   class EnumIsCaseExpr extends Generated::EnumIsCaseExpr {
-    override string toString() { result = "... is " + this.getElement().toString() }
+    override string toStringImpl() { result = "... is " + this.getElement().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ExplicitCastExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ExplicitCastExprImpl.qll
index 9e961502ccd1..76814e7c70ad 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ExplicitCastExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ExplicitCastExprImpl.qll
@@ -4,6 +4,6 @@ module Impl {
   class ExplicitCastExpr extends Generated::ExplicitCastExpr {
     override predicate convertsFrom(Expr e) { e = this.getImmediateSubExpr() }
 
-    override string toString() { result = "(" + this.getType() + ") ..." }
+    override string toStringImpl() { result = "(" + this.getType() + ") ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/FloatLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/FloatLiteralExprImpl.qll
index c7a7f1c714f4..68e96b0b6c64 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/FloatLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/FloatLiteralExprImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.expr.FloatLiteralExpr
 
 module Impl {
   class FloatLiteralExpr extends Generated::FloatLiteralExpr {
-    override string toString() { result = this.getStringValue() }
+    override string toStringImpl() { result = this.getStringValue() }
 
     override string getValueString() { result = this.getStringValue() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ForceTryExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ForceTryExprImpl.qll
index 2f53e5138151..562d564fbcc6 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ForceTryExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ForceTryExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ForceTryExpr
 
 module Impl {
   class ForceTryExpr extends Generated::ForceTryExpr {
-    override string toString() { result = "try! ..." }
+    override string toStringImpl() { result = "try! ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ForceValueExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ForceValueExprImpl.qll
index 84e89108c949..32a4f84ea770 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ForceValueExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ForceValueExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ForceValueExpr
 
 module Impl {
   class ForceValueExpr extends Generated::ForceValueExpr {
-    override string toString() { result = "...!" }
+    override string toStringImpl() { result = "...!" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/IfExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/IfExprImpl.qll
index 359d3ff50945..65f72960a3f6 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/IfExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/IfExprImpl.qll
@@ -10,6 +10,6 @@ module Impl {
       result = this.getElseExpr()
     }
 
-    override string toString() { result = "... ? ... : ..." }
+    override string toStringImpl() { result = "... ? ... : ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ImplicitConversionExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ImplicitConversionExprImpl.qll
index f4ab0120cf87..35598dfc0739 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ImplicitConversionExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ImplicitConversionExprImpl.qll
@@ -4,6 +4,6 @@ module Impl {
   class ImplicitConversionExpr extends Generated::ImplicitConversionExpr {
     override predicate convertsFrom(Expr e) { e = this.getImmediateSubExpr() }
 
-    override string toString() { result = "(" + this.getType().toString() + ") ..." }
+    override string toStringImpl() { result = "(" + this.getType().toStringImpl() + ") ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/InOutExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/InOutExprImpl.qll
index 54acc229a957..3cddcc6bdc0e 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/InOutExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/InOutExprImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.expr.InOutExpr
 
 module Impl {
   class InOutExpr extends Generated::InOutExpr {
-    override string toString() { result = "&..." }
+    override string toStringImpl() { result = "&..." }
 
     override predicate convertsFrom(Expr e) { e = this.getImmediateSubExpr() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/IntegerLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/IntegerLiteralExprImpl.qll
index 3256c7cd9b36..c41256b09014 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/IntegerLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/IntegerLiteralExprImpl.qll
@@ -8,7 +8,7 @@ module Impl {
    * ```
    */
   class IntegerLiteralExpr extends Generated::IntegerLiteralExpr {
-    override string toString() { result = this.getStringValue() }
+    override string toStringImpl() { result = this.getStringValue() }
 
     override string getValueString() { result = this.getStringValue() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/InterpolatedStringLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/InterpolatedStringLiteralExprImpl.qll
index 01e2ab92c2ab..7a2c00c94467 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/InterpolatedStringLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/InterpolatedStringLiteralExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.InterpolatedStringLiteralExpr
 
 module Impl {
   class InterpolatedStringLiteralExpr extends Generated::InterpolatedStringLiteralExpr {
-    override string toString() { result = "\"...\"" }
+    override string toStringImpl() { result = "\"...\"" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/IsExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/IsExprImpl.qll
index 69a5855b017a..e8f60812cfec 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/IsExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/IsExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.IsExpr
 
 module Impl {
   class IsExpr extends Generated::IsExpr {
-    override string toString() { result = "... is ..." }
+    override string toStringImpl() { result = "... is ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathApplicationExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathApplicationExprImpl.qll
index f94532ccbcd9..94b7771e8ee7 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathApplicationExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathApplicationExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.KeyPathApplicationExpr
 
 module Impl {
   class KeyPathApplicationExpr extends Generated::KeyPathApplicationExpr {
-    override string toString() { result = "\\...[...]" }
+    override string toStringImpl() { result = "\\...[...]" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathDotExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathDotExprImpl.qll
index 105644cfed0e..477e09f15929 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathDotExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathDotExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.KeyPathDotExpr
 
 module Impl {
   class KeyPathDotExpr extends Generated::KeyPathDotExpr {
-    override string toString() { result = "\\...." }
+    override string toStringImpl() { result = "\\...." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathExprImpl.qll
index 88a526cc3240..a2b957708f4e 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathExprImpl.qll
@@ -6,6 +6,6 @@ module Impl {
    * A key-path expression.
    */
   class KeyPathExpr extends Generated::KeyPathExpr {
-    override string toString() { result = "#keyPath(...)" }
+    override string toStringImpl() { result = "#keyPath(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/LazyInitializationExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/LazyInitializationExprImpl.qll
index ed81fc84c287..69de6f6949c9 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/LazyInitializationExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/LazyInitializationExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.LazyInitializationExpr
 
 module Impl {
   class LazyInitializationExpr extends Generated::LazyInitializationExpr {
-    override string toString() { result = this.getSubExpr().toString() }
+    override string toStringImpl() { result = this.getSubExpr().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/MagicIdentifierLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/MagicIdentifierLiteralExprImpl.qll
index 3e561f5f5b03..9362a6df647f 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/MagicIdentifierLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/MagicIdentifierLiteralExprImpl.qll
@@ -8,7 +8,7 @@ module Impl {
    * ```
    */
   class MagicIdentifierLiteralExpr extends Generated::MagicIdentifierLiteralExpr {
-    override string toString() { result = "#..." }
+    override string toStringImpl() { result = "#..." }
 
     override string getValueString() { none() } // TODO: value not yet extracted
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/MakeTemporarilyEscapableExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/MakeTemporarilyEscapableExprImpl.qll
index e9e036bf055e..be2bdb24d749 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/MakeTemporarilyEscapableExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/MakeTemporarilyEscapableExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.MakeTemporarilyEscapableExpr
 
 module Impl {
   class MakeTemporarilyEscapableExpr extends Generated::MakeTemporarilyEscapableExpr {
-    override string toString() { result = this.getSubExpr().toString() }
+    override string toStringImpl() { result = this.getSubExpr().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/MemberRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/MemberRefExprImpl.qll
index 1304062a7a9e..8d65bf5eb75f 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/MemberRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/MemberRefExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.MemberRefExpr
 
 module Impl {
   class MemberRefExpr extends Generated::MemberRefExpr {
-    override string toString() { result = "." + this.getMember().toString() }
+    override string toStringImpl() { result = "." + this.getMember().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/MethodLookupExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/MethodLookupExprImpl.qll
index 2c42998e6044..356ccb97f04c 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/MethodLookupExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/MethodLookupExprImpl.qll
@@ -9,7 +9,7 @@ private import codeql.swift.generated.Synth
 
 module Impl {
   class MethodLookupExpr extends Generated::MethodLookupExpr {
-    override string toString() { result = "." + this.getMember().toString() }
+    override string toStringImpl() { result = "." + this.getMember().toStringImpl() }
 
     override Expr getImmediateBase() {
       result = Synth::convertExprFromRaw(this.getUnderlying().getBase())
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/NilLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/NilLiteralExprImpl.qll
index a80b29f1ab75..ae45fbd489b4 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/NilLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/NilLiteralExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.NilLiteralExpr
 
 module Impl {
   class NilLiteralExpr extends Generated::NilLiteralExpr {
-    override string toString() { result = "nil" }
+    override string toStringImpl() { result = "nil" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ObjCSelectorExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ObjCSelectorExprImpl.qll
index 9d96b84a2f04..237b94dd0c7e 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ObjCSelectorExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ObjCSelectorExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ObjCSelectorExpr
 
 module Impl {
   class ObjCSelectorExpr extends Generated::ObjCSelectorExpr {
-    override string toString() { result = "#selector(...)" }
+    override string toStringImpl() { result = "#selector(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ObjectLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ObjectLiteralExprImpl.qll
index 2d29e1a0cf53..8a3d3f18d3af 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ObjectLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ObjectLiteralExprImpl.qll
@@ -10,18 +10,18 @@ module Impl {
   class FileLiteralExpr extends ObjectLiteralExpr {
     FileLiteralExpr() { this.getKind() = 0 }
 
-    override string toString() { result = "#fileLiteral(...)" }
+    override string toStringImpl() { result = "#fileLiteral(...)" }
   }
 
   class ImageLiteralExpr extends ObjectLiteralExpr {
     ImageLiteralExpr() { this.getKind() = 1 }
 
-    override string toString() { result = "#imageLiteral(...)" }
+    override string toStringImpl() { result = "#imageLiteral(...)" }
   }
 
   class ColorLiteralExpr extends ObjectLiteralExpr {
     ColorLiteralExpr() { this.getKind() = 2 }
 
-    override string toString() { result = "#colorLiteral(...)" }
+    override string toStringImpl() { result = "#colorLiteral(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/OneWayExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/OneWayExprImpl.qll
index f69a19547fe7..9c15b822610d 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/OneWayExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/OneWayExprImpl.qll
@@ -4,6 +4,6 @@ module Impl {
   class OneWayExpr extends Generated::OneWayExpr {
     override predicate convertsFrom(Expr e) { e = this.getImmediateSubExpr() }
 
-    override string toString() { result = this.getSubExpr().toString() }
+    override string toStringImpl() { result = this.getSubExpr().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/OptionalTryExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/OptionalTryExprImpl.qll
index 2e92c82e5a30..b58ed5e401c9 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/OptionalTryExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/OptionalTryExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.OptionalTryExpr
 
 module Impl {
   class OptionalTryExpr extends Generated::OptionalTryExpr {
-    override string toString() { result = "try? ..." }
+    override string toStringImpl() { result = "try? ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/OtherInitializerRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/OtherInitializerRefExprImpl.qll
index 50c9355f438e..7b35e4cc3fb8 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/OtherInitializerRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/OtherInitializerRefExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.OtherInitializerRefExpr
 
 module Impl {
   class OtherInitializerRefExpr extends Generated::OtherInitializerRefExpr {
-    override string toString() { result = this.getInitializer().toString() }
+    override string toStringImpl() { result = this.getInitializer().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ParenExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ParenExprImpl.qll
index 0db93aeb20c2..4018db2b0b7c 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ParenExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ParenExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ParenExpr
 
 module Impl {
   class ParenExpr extends Generated::ParenExpr {
-    override string toString() { result = "(...)" }
+    override string toStringImpl() { result = "(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/RebindSelfInInitializerExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/RebindSelfInInitializerExprImpl.qll
index 7b74336ceedf..93ec90842c37 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/RebindSelfInInitializerExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/RebindSelfInInitializerExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.RebindSelfInInitializerExpr
 
 module Impl {
   class RebindSelfInInitializerExpr extends Generated::RebindSelfInInitializerExpr {
-    override string toString() { result = "self = ..." }
+    override string toStringImpl() { result = "self = ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/RegexLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/RegexLiteralExprImpl.qll
index 8d2271838aef..a1c454a2b0f4 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/RegexLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/RegexLiteralExprImpl.qll
@@ -6,6 +6,6 @@ module Impl {
    * A regular expression literal which is checked at compile time, for example `/a(a|b)*b/`.
    */
   class RegexLiteralExpr extends Generated::RegexLiteralExpr {
-    override string toString() { result = this.getPattern() }
+    override string toStringImpl() { result = this.getPattern() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/StringLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/StringLiteralExprImpl.qll
index 3e8f6e7592ec..8d60c4bc58bc 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/StringLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/StringLiteralExprImpl.qll
@@ -8,7 +8,7 @@ module Impl {
    * ```
    */
   class StringLiteralExpr extends Generated::StringLiteralExpr {
-    override string toString() { result = this.getValue() }
+    override string toStringImpl() { result = this.getValue() }
 
     override string getValueString() { result = this.getValue() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/SubscriptExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/SubscriptExprImpl.qll
index 34e19ccfe61c..cc215525736a 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/SubscriptExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/SubscriptExprImpl.qll
@@ -16,6 +16,6 @@ module Impl {
       )
     }
 
-    override string toString() { result = "...[...]" }
+    override string toStringImpl() { result = "...[...]" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/SuperRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/SuperRefExprImpl.qll
index d1afe5938967..b2bd85bae9e2 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/SuperRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/SuperRefExprImpl.qll
@@ -4,7 +4,7 @@ private import codeql.swift.elements.decl.Method
 module Impl {
   /** A reference to `super`. */
   class SuperRefExpr extends Generated::SuperRefExpr {
-    override string toString() { result = "super" }
+    override string toStringImpl() { result = "super" }
 
     Method getDeclaringMethod() { this.getSelf() = result.getSelfParam() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/TryExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/TryExprImpl.qll
index b372e4f22e7b..062c63cc44fa 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/TryExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/TryExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.TryExpr
 
 module Impl {
   class TryExpr extends Generated::TryExpr {
-    override string toString() { result = "try ..." }
+    override string toStringImpl() { result = "try ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/TupleElementExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/TupleElementExprImpl.qll
index 18ff29f6832d..6d35633ea38d 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/TupleElementExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/TupleElementExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.TupleElementExpr
 
 module Impl {
   class TupleElementExpr extends Generated::TupleElementExpr {
-    override string toString() { result = "." + this.getIndex() }
+    override string toStringImpl() { result = "." + this.getIndex() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/TupleExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/TupleExprImpl.qll
index f2322ef2de1f..32f415a94664 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/TupleExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/TupleExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.TupleExpr
 
 module Impl {
   class TupleExpr extends Generated::TupleExpr {
-    override string toString() { result = "(...)" }
+    override string toStringImpl() { result = "(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/TypeExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/TypeExprImpl.qll
index d2e3ad63ebee..ea69620b5cd9 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/TypeExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/TypeExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.TypeExpr
 
 module Impl {
   class TypeExpr extends Generated::TypeExpr {
-    override string toString() { result = this.getType().toString() }
+    override string toStringImpl() { result = this.getType().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDeclRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDeclRefExprImpl.qll
index 92a534e9226f..35c7443925ca 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDeclRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDeclRefExprImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.expr.UnresolvedDeclRefExpr
 
 module Impl {
   class UnresolvedDeclRefExpr extends Generated::UnresolvedDeclRefExpr {
-    override string toString() {
+    override string toStringImpl() {
       result = this.getName() + " (unresolved)"
       or
       not this.hasName() and result = "(unresolved)"
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDotExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDotExprImpl.qll
index 4ecd37ad0f72..54e5b1d43915 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDotExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDotExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.UnresolvedDotExpr
 
 module Impl {
   class UnresolvedDotExpr extends Generated::UnresolvedDotExpr {
-    override string toString() { result = "... ." + this.getName() }
+    override string toStringImpl() { result = "... ." + this.getName() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/VarargExpansionExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/VarargExpansionExprImpl.qll
index 98ceee8e8e7b..9e3c1f072c75 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/VarargExpansionExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/VarargExpansionExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.VarargExpansionExpr
 
 module Impl {
   class VarargExpansionExpr extends Generated::VarargExpansionExpr {
-    override string toString() { result = this.getSubExpr().toString() }
+    override string toStringImpl() { result = this.getSubExpr().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/AvailabilityInfoImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/AvailabilityInfoImpl.qll
index caa478fbc2de..d34917e1a10b 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/AvailabilityInfoImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/AvailabilityInfoImpl.qll
@@ -18,7 +18,7 @@ module Impl {
    * ```
    */
   class AvailabilityInfo extends Generated::AvailabilityInfo {
-    override string toString() {
+    override string toStringImpl() {
       result = "#available" and not this.isUnavailable()
       or
       result = "#unavailable" and this.isUnavailable()
diff --git a/swift/ql/lib/codeql/swift/elements/internal/CommentImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/CommentImpl.qll
index 642155c67a55..5f4259ab937f 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/CommentImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/CommentImpl.qll
@@ -3,6 +3,6 @@ private import codeql.swift.generated.Comment
 module Impl {
   class Comment extends Generated::Comment {
     /** toString */
-    override string toString() { result = this.getText() }
+    override string toStringImpl() { result = this.getText() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/DiagnosticsImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/DiagnosticsImpl.qll
index dc19291d9a4a..60b0c039901e 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/DiagnosticsImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/DiagnosticsImpl.qll
@@ -5,7 +5,7 @@ module Impl {
    * A compiler-generated error, warning, note or remark.
    */
   class Diagnostics extends Generated::Diagnostics {
-    override string toString() { result = this.getSeverity() + ": " + this.getText() }
+    override string toStringImpl() { result = this.getSeverity() + ": " + this.getText() }
 
     /**
      * Gets a string representing the severity of this compiler diagnostic.
diff --git a/swift/ql/lib/codeql/swift/elements/internal/ElementImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/ElementImpl.qll
index 882e7eda383c..4b4e77b0d934 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/ElementImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/ElementImpl.qll
@@ -4,7 +4,7 @@ module Impl {
   class Element extends Generated::Element {
     private predicate resolvesFrom(Element e) { e.getResolveStep() = this }
 
-    override string toString() { result = this.getPrimaryQlClasses() }
+    override string toStringImpl() { result = this.getPrimaryQlClasses() }
 
     Element getFullyUnresolved() {
       not this.resolvesFrom(_) and result = this
diff --git a/swift/ql/lib/codeql/swift/elements/internal/FileImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/FileImpl.qll
index 2aac757e248e..4369cfb4515d 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/FileImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/FileImpl.qll
@@ -5,7 +5,7 @@ private import codeql.swift.elements.UnknownLocation
 module Impl {
   class File extends Generated::File {
     /** toString */
-    override string toString() { result = this.getAbsolutePath() }
+    override string toStringImpl() { result = this.getAbsolutePath() }
 
     /** Gets the absolute path of this file. */
     string getAbsolutePath() { result = this.getName() }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/LocationImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/LocationImpl.qll
index acb7e788e87d..f607065caea4 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/LocationImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/LocationImpl.qll
@@ -21,7 +21,7 @@ module Impl {
     /**
      * Gets a textual representation of this location.
      */
-    override string toString() {
+    override string toStringImpl() {
       exists(string filePath, int startLine, int startColumn, int endLine, int endColumn |
         this.hasLocationInfo(filePath, startLine, startColumn, endLine, endColumn)
       |
diff --git a/swift/ql/lib/codeql/swift/elements/internal/MacroRoleImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/MacroRoleImpl.qll
index 8ba4f5ff484b..68c57b907b13 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/MacroRoleImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/MacroRoleImpl.qll
@@ -97,7 +97,7 @@ module Impl {
      */
     predicate isAttachedMacroSyntax() { this.getMacroSyntax() = 1 }
 
-    override string toString() {
+    override string toStringImpl() {
       result = this.getMacroSyntaxName() + "(" + this.getKindName() + ")"
     }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecImpl.qll
index 84135e66a264..96729ac9092c 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecImpl.qll
@@ -6,6 +6,6 @@ module Impl {
    * A wildcard availability spec `*`
    */
   class OtherAvailabilitySpec extends Generated::OtherAvailabilitySpec {
-    override string toString() { result = "*" }
+    override string toStringImpl() { result = "*" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecImpl.qll
index 5d17697b7fb8..e5d4814338d7 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecImpl.qll
@@ -6,6 +6,6 @@ module Impl {
    * An availability spec based on platform and version, for example `macOS 12` or `watchOS 14`
    */
   class PlatformVersionAvailabilitySpec extends Generated::PlatformVersionAvailabilitySpec {
-    override string toString() { result = this.getPlatform() + " " + this.getVersion() }
+    override string toStringImpl() { result = this.getPlatform() + " " + this.getVersion() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/UnknownLocationImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/UnknownLocationImpl.qll
index a39b8ed21800..0862ed94c4a9 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/UnknownLocationImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/UnknownLocationImpl.qll
@@ -17,6 +17,6 @@ module Impl {
 
     override int getEndColumn() { result = 0 }
 
-    override string toString() { result = "UnknownLocation" }
+    override string toStringImpl() { result = "UnknownLocation" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/UnspecifiedElementImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/UnspecifiedElementImpl.qll
index e2d7c5a32d9b..af32b9c31513 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/UnspecifiedElementImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/UnspecifiedElementImpl.qll
@@ -4,7 +4,7 @@ import codeql.swift.elements.Locatable
 
 module Impl {
   class UnspecifiedElement extends Generated::UnspecifiedElement {
-    override string toString() {
+    override string toStringImpl() {
       exists(string source, string index |
         (
           source = " from " + this.getParent().getPrimaryQlClasses()
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/AnyPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/AnyPatternImpl.qll
index 98e755da2c61..67cccf515ea0 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/AnyPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/AnyPatternImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.pattern.AnyPattern
 
 module Impl {
   class AnyPattern extends Generated::AnyPattern {
-    override string toString() { result = "_" }
+    override string toStringImpl() { result = "_" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/BindingPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/BindingPatternImpl.qll
index b896afe51902..c8b687837f48 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/BindingPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/BindingPatternImpl.qll
@@ -4,6 +4,6 @@ module Impl {
   class BindingPattern extends Generated::BindingPattern {
     final override Pattern getResolveStep() { result = this.getImmediateSubPattern() }
 
-    override string toString() { result = "let ..." }
+    override string toStringImpl() { result = "let ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/BoolPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/BoolPatternImpl.qll
index 471993c4b3b8..a2a7f5aa9af4 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/BoolPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/BoolPatternImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.pattern.BoolPattern
 
 module Impl {
   class BoolPattern extends Generated::BoolPattern {
-    override string toString() { result = this.getValue().toString() }
+    override string toStringImpl() { result = this.getValue().toString() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/EnumElementPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/EnumElementPatternImpl.qll
index c46a0b85a088..c436e24e57dd 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/EnumElementPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/EnumElementPatternImpl.qll
@@ -15,10 +15,10 @@ module Impl {
       i = 0
     }
 
-    override string toString() {
+    override string toStringImpl() {
       if this.hasSubPattern()
-      then result = "." + this.getElement().toString() + "(...)"
-      else result = "." + this.getElement().toString()
+      then result = "." + this.getElement().toStringImpl() + "(...)"
+      else result = "." + this.getElement().toStringImpl()
     }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/ExprPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/ExprPatternImpl.qll
index e313a5ce10da..d7d384a4efe4 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/ExprPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/ExprPatternImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.pattern.ExprPattern
 
 module Impl {
   class ExprPattern extends Generated::ExprPattern {
-    override string toString() { result = "=~ ..." }
+    override string toStringImpl() { result = "=~ ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/IsPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/IsPatternImpl.qll
index 9fb6e84cc238..1d2c9843d8c3 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/IsPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/IsPatternImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.pattern.IsPattern
 
 module Impl {
   class IsPattern extends Generated::IsPattern {
-    override string toString() { result = "... is ..." }
+    override string toStringImpl() { result = "... is ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/NamedPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/NamedPatternImpl.qll
index fc6ebb52e7a6..d4453cb42ff4 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/NamedPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/NamedPatternImpl.qll
@@ -21,6 +21,6 @@ module Impl {
      */
     string getName() { result = this.getVarDecl().getName() }
 
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/OptionalSomePatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/OptionalSomePatternImpl.qll
index 1c8aee702b00..4055108b1b0b 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/OptionalSomePatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/OptionalSomePatternImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.pattern.OptionalSomePattern
 
 module Impl {
   class OptionalSomePattern extends Generated::OptionalSomePattern {
-    override string toString() { result = "let ...?" }
+    override string toStringImpl() { result = "let ...?" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/ParenPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/ParenPatternImpl.qll
index fd5c9ab54431..dc1b14b4128e 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/ParenPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/ParenPatternImpl.qll
@@ -4,6 +4,6 @@ module Impl {
   class ParenPattern extends Generated::ParenPattern {
     final override Pattern getResolveStep() { result = this.getImmediateSubPattern() }
 
-    override string toString() { result = "(...)" }
+    override string toStringImpl() { result = "(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/TuplePatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/TuplePatternImpl.qll
index 6ed969e4a106..701ab8b50f87 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/TuplePatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/TuplePatternImpl.qll
@@ -11,6 +11,6 @@ module Impl {
       )
     }
 
-    override string toString() { result = "(...)" }
+    override string toStringImpl() { result = "(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/TypedPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/TypedPatternImpl.qll
index 49b905f8d643..0a86ac85df22 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/TypedPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/TypedPatternImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.pattern.TypedPattern
 
 module Impl {
   class TypedPattern extends Generated::TypedPattern {
-    override string toString() {
+    override string toStringImpl() {
       if exists(this.getSubPattern()) then result = "... as ..." else result = "is ..."
     }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/BraceStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/BraceStmtImpl.qll
index 6f4cdbd37742..a562955646fe 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/BraceStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/BraceStmtImpl.qll
@@ -11,7 +11,7 @@ module Impl {
       )
     }
 
-    override string toString() { result = "{ ... }" }
+    override string toStringImpl() { result = "{ ... }" }
 
     override AstNode getImmediateElement(int index) {
       result =
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/BreakStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/BreakStmtImpl.qll
index 6f1b58aecd4e..8a8243b5998b 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/BreakStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/BreakStmtImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.stmt.BreakStmt
 
 module Impl {
   class BreakStmt extends Generated::BreakStmt {
-    override string toString() {
+    override string toStringImpl() {
       result = "break " + this.getTargetName()
       or
       not this.hasTargetName() and
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseLabelItemImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseLabelItemImpl.qll
index 003d2b342b16..4e0870f556ee 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseLabelItemImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseLabelItemImpl.qll
@@ -2,10 +2,10 @@ private import codeql.swift.generated.stmt.CaseLabelItem
 
 module Impl {
   class CaseLabelItem extends Generated::CaseLabelItem {
-    override string toString() {
+    override string toStringImpl() {
       if this.hasGuard()
-      then result = this.getPattern().toString() + " where ..."
-      else result = this.getPattern().toString()
+      then result = this.getPattern().toStringImpl() + " where ..."
+      else result = this.getPattern().toStringImpl()
     }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseStmtImpl.qll
index 17b9b6462144..d3e620ae9e1d 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseStmtImpl.qll
@@ -11,6 +11,6 @@ module Impl {
       )
     }
 
-    override string toString() { result = "case ..." }
+    override string toStringImpl() { result = "case ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/ConditionElementImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/ConditionElementImpl.qll
index 72740933998d..a2b52efddd21 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/ConditionElementImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/ConditionElementImpl.qll
@@ -3,12 +3,12 @@ private import codeql.swift.elements.AstNode
 
 module Impl {
   class ConditionElement extends Generated::ConditionElement {
-    override string toString() {
-      result = this.getBoolean().toString()
+    override string toStringImpl() {
+      result = this.getBoolean().toStringImpl()
       or
-      result = this.getPattern().toString() + " = ... "
+      result = this.getPattern().toStringImpl() + " = ... "
       or
-      result = this.getAvailability().toString()
+      result = this.getAvailability().toStringImpl()
     }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/ContinueStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/ContinueStmtImpl.qll
index 58747a44e420..8389184c465d 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/ContinueStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/ContinueStmtImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.stmt.ContinueStmt
 
 module Impl {
   class ContinueStmt extends Generated::ContinueStmt {
-    override string toString() {
+    override string toStringImpl() {
       result = "continue " + this.getTargetName()
       or
       not this.hasTargetName() and
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/DeferStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/DeferStmtImpl.qll
index 97e565d4160f..18d70b0dc948 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/DeferStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/DeferStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.DeferStmt
 
 module Impl {
   class DeferStmt extends Generated::DeferStmt {
-    override string toString() { result = "defer { ... }" }
+    override string toStringImpl() { result = "defer { ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/DoCatchStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/DoCatchStmtImpl.qll
index 20fb2b8ddbc3..5a84808057f4 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/DoCatchStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/DoCatchStmtImpl.qll
@@ -11,6 +11,6 @@ module Impl {
       )
     }
 
-    override string toString() { result = "do { ... } catch { ... }" }
+    override string toStringImpl() { result = "do { ... } catch { ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/DoStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/DoStmtImpl.qll
index 0e43521181fa..fd3952f97a42 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/DoStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/DoStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.DoStmt
 
 module Impl {
   class DoStmt extends Generated::DoStmt {
-    override string toString() { result = "do { ... }" }
+    override string toStringImpl() { result = "do { ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/FailStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/FailStmtImpl.qll
index 9ab2240102eb..dbad37f4f954 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/FailStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/FailStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.FailStmt
 
 module Impl {
   class FailStmt extends Generated::FailStmt {
-    override string toString() { result = "fail" }
+    override string toStringImpl() { result = "fail" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/FallthroughStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/FallthroughStmtImpl.qll
index 85fa9e95a655..47d858f46ba1 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/FallthroughStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/FallthroughStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.FallthroughStmt
 
 module Impl {
   class FallthroughStmt extends Generated::FallthroughStmt {
-    override string toString() { result = "fallthrough" }
+    override string toStringImpl() { result = "fallthrough" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/ForEachStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/ForEachStmtImpl.qll
index bc8d67d01335..e5b112215455 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/ForEachStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/ForEachStmtImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.stmt.ForEachStmt
 
 module Impl {
   class ForEachStmt extends Generated::ForEachStmt {
-    override string toString() {
+    override string toStringImpl() {
       if this.hasWhere()
       then result = "for ... in ... where ... { ... }"
       else result = "for ... in ... { ... }"
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/GuardStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/GuardStmtImpl.qll
index d2281c8ef592..4dab3b78acf7 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/GuardStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/GuardStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.GuardStmt
 
 module Impl {
   class GuardStmt extends Generated::GuardStmt {
-    override string toString() { result = "guard ... else { ... }" }
+    override string toStringImpl() { result = "guard ... else { ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/IfStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/IfStmtImpl.qll
index 8d1349631982..47c1611548a0 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/IfStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/IfStmtImpl.qll
@@ -15,7 +15,7 @@ module Impl {
       result = this.getElse()
     }
 
-    override string toString() {
+    override string toStringImpl() {
       if this.hasElse()
       then result = "if ... then { ... } else { ... }"
       else result = "if ... then { ... }"
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/LabeledStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/LabeledStmtImpl.qll
index 677e21f3e5ba..b4f39e059afe 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/LabeledStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/LabeledStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.LabeledStmt
 
 module Impl {
   class LabeledStmt extends Generated::LabeledStmt {
-    override string toString() { result = this.getLabel() + ": ..." }
+    override string toStringImpl() { result = this.getLabel() + ": ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/PoundAssertStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/PoundAssertStmtImpl.qll
index e7d208998d4b..88f8c921e9aa 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/PoundAssertStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/PoundAssertStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.PoundAssertStmt
 
 module Impl {
   class PoundAssertStmt extends Generated::PoundAssertStmt {
-    override string toString() { result = "#assert ..." }
+    override string toStringImpl() { result = "#assert ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/RepeatWhileStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/RepeatWhileStmtImpl.qll
index 867aee0d5de0..1542f7548e36 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/RepeatWhileStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/RepeatWhileStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.RepeatWhileStmt
 
 module Impl {
   class RepeatWhileStmt extends Generated::RepeatWhileStmt {
-    override string toString() { result = "repeat { ... } while ... " }
+    override string toStringImpl() { result = "repeat { ... } while ... " }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/ReturnStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/ReturnStmtImpl.qll
index d53eb3d0eee0..f93429dafd8c 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/ReturnStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/ReturnStmtImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.stmt.ReturnStmt
 
 module Impl {
   class ReturnStmt extends Generated::ReturnStmt {
-    override string toString() {
+    override string toStringImpl() {
       if this.hasResult() then result = "return ..." else result = "return"
     }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/SwitchStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/SwitchStmtImpl.qll
index 850f857bdccb..32c12ec4a0df 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/SwitchStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/SwitchStmtImpl.qll
@@ -11,6 +11,8 @@ module Impl {
       )
     }
 
-    override string toString() { result = "switch " + this.getExpr().toString() + " { ... }" }
+    override string toStringImpl() {
+      result = "switch " + this.getExpr().toStringImpl() + " { ... }"
+    }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/ThrowStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/ThrowStmtImpl.qll
index 2865061216d6..e15c8eaf5f3a 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/ThrowStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/ThrowStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.ThrowStmt
 
 module Impl {
   class ThrowStmt extends Generated::ThrowStmt {
-    override string toString() { result = "throw ..." }
+    override string toStringImpl() { result = "throw ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/WhileStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/WhileStmtImpl.qll
index 9359c6ccd20a..7698a127bee5 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/WhileStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/WhileStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.WhileStmt
 
 module Impl {
   class WhileStmt extends Generated::WhileStmt {
-    override string toString() { result = "while ... { ... }" }
+    override string toStringImpl() { result = "while ... { ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/YieldStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/YieldStmtImpl.qll
index aeb1623d9bb7..942a3dfde1d9 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/YieldStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/YieldStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.YieldStmt
 
 module Impl {
   class YieldStmt extends Generated::YieldStmt {
-    override string toString() { result = "yield ..." }
+    override string toStringImpl() { result = "yield ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/type/internal/TypeImpl.qll b/swift/ql/lib/codeql/swift/elements/type/internal/TypeImpl.qll
index 625d5b5312df..b3467492257e 100644
--- a/swift/ql/lib/codeql/swift/elements/type/internal/TypeImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/type/internal/TypeImpl.qll
@@ -8,7 +8,7 @@ module Impl {
    * This QL class is the root of the Swift type hierarchy.
    */
   class Type extends Generated::Type {
-    override string toString() { result = this.getFullName() }
+    override string toStringImpl() { result = this.getFullName() }
 
     /**
      * Gets the name of this type.
diff --git a/swift/ql/lib/codeql/swift/elements/type/internal/TypeReprImpl.qll b/swift/ql/lib/codeql/swift/elements/type/internal/TypeReprImpl.qll
index 98b4b0f05283..1da1ed2d2a72 100644
--- a/swift/ql/lib/codeql/swift/elements/type/internal/TypeReprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/type/internal/TypeReprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.type.TypeRepr
 
 module Impl {
   class TypeRepr extends Generated::TypeRepr {
-    override string toString() { result = this.getType().toString() }
+    override string toStringImpl() { result = this.getType().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/generated/Element.qll b/swift/ql/lib/codeql/swift/generated/Element.qll
index 94315ea3e554..cfb8fbc32085 100644
--- a/swift/ql/lib/codeql/swift/generated/Element.qll
+++ b/swift/ql/lib/codeql/swift/generated/Element.qll
@@ -23,7 +23,15 @@ module Generated {
     /**
      * Gets the string representation of this element.
      */
-    string toString() { none() } // overridden by subclasses
+    cached
+    final string toString() { result = this.toStringImpl() }
+
+    /**
+     * INTERNAL: Do not use.
+     *
+     * Gets the string representation of this element.
+     */
+    abstract string toStringImpl();
 
     /**
      * Gets the name of a primary CodeQL class to which this element belongs.