diff --git a/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.expected b/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.expected
index 85c426e9c28b..309665f809f6 100644
--- a/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.expected
+++ b/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.expected
@@ -1 +1,17 @@
 | P<Int, String> | getName: | P<Int, String> | getCanonicalType: | P<Int, String> | getBase: | P | getNumberOfArgs: | 2 |
+| RawRepresentable<Bool> | getName: | RawRepresentable<Bool> | getCanonicalType: | RawRepresentable<Bool> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<Double> | getName: | RawRepresentable<Double> | getCanonicalType: | RawRepresentable<Double> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<Float> | getName: | RawRepresentable<Float> | getCanonicalType: | RawRepresentable<Float> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<Int8> | getName: | RawRepresentable<Int8> | getCanonicalType: | RawRepresentable<Int8> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<Int16> | getName: | RawRepresentable<Int16> | getCanonicalType: | RawRepresentable<Int16> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<Int32> | getName: | RawRepresentable<Int32> | getCanonicalType: | RawRepresentable<Int32> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<Int64> | getName: | RawRepresentable<Int64> | getCanonicalType: | RawRepresentable<Int64> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<Int128> | getName: | RawRepresentable<Int128> | getCanonicalType: | RawRepresentable<Int128> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<Int> | getName: | RawRepresentable<Int> | getCanonicalType: | RawRepresentable<Int> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<String> | getName: | RawRepresentable<String> | getCanonicalType: | RawRepresentable<String> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<UInt8> | getName: | RawRepresentable<UInt8> | getCanonicalType: | RawRepresentable<UInt8> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<UInt16> | getName: | RawRepresentable<UInt16> | getCanonicalType: | RawRepresentable<UInt16> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<UInt32> | getName: | RawRepresentable<UInt32> | getCanonicalType: | RawRepresentable<UInt32> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<UInt64> | getName: | RawRepresentable<UInt64> | getCanonicalType: | RawRepresentable<UInt64> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<UInt128> | getName: | RawRepresentable<UInt128> | getCanonicalType: | RawRepresentable<UInt128> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
+| RawRepresentable<UInt> | getName: | RawRepresentable<UInt> | getCanonicalType: | RawRepresentable<UInt> | getBase: | RawRepresentable | getNumberOfArgs: | 1 |
diff --git a/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType_getArg.expected b/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType_getArg.expected
index 957992286582..2762281ade28 100644
--- a/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType_getArg.expected
+++ b/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType_getArg.expected
@@ -1,2 +1,18 @@
 | P<Int, String> | 0 | Int |
 | P<Int, String> | 1 | String |
+| RawRepresentable<Bool> | 0 | Bool |
+| RawRepresentable<Double> | 0 | Double |
+| RawRepresentable<Float> | 0 | Float |
+| RawRepresentable<Int8> | 0 | Int8 |
+| RawRepresentable<Int16> | 0 | Int16 |
+| RawRepresentable<Int32> | 0 | Int32 |
+| RawRepresentable<Int64> | 0 | Int64 |
+| RawRepresentable<Int128> | 0 | Int128 |
+| RawRepresentable<Int> | 0 | Int |
+| RawRepresentable<String> | 0 | String |
+| RawRepresentable<UInt8> | 0 | UInt8 |
+| RawRepresentable<UInt16> | 0 | UInt16 |
+| RawRepresentable<UInt32> | 0 | UInt32 |
+| RawRepresentable<UInt64> | 0 | UInt64 |
+| RawRepresentable<UInt128> | 0 | UInt128 |
+| RawRepresentable<UInt> | 0 | UInt |
diff --git a/swift/ql/test/library-tests/ast/PrintAst.expected b/swift/ql/test/library-tests/ast/PrintAst.expected
index 82d866baec90..07713e4c28d5 100644
--- a/swift/ql/test/library-tests/ast/PrintAst.expected
+++ b/swift/ql/test/library-tests/ast/PrintAst.expected
@@ -702,6 +702,8 @@ cfg.swift:
 #  155|     getVariable(1): [ConcreteVarDecl] xOptional
 #  155|         Type = Int?
 #  138|     getElement(0): [ForEachStmt] for ... in ... { ... }
+#  138|       getVariable(0): [ConcreteVarDecl] $generator
+#  138|           Type = IndexingIterator<ClosedRange<Int>>
 #  138|       getPattern(): [AnyPattern] _
 #-----|       getIteratorVar(): [PatternBindingDecl] var ... = ...
 #  138|         getInit(0): [CallExpr] call to makeIterator()
@@ -844,8 +846,6 @@ cfg.swift:
 #  158|       getElse(): [BraceStmt] { ... }
 #  159|         getElement(0): [ReturnStmt] return ...
 #  159|           getResult(): [BooleanLiteralExpr] false
-#  138| [ConcreteVarDecl] $generator
-#  138|     Type = IndexingIterator<ClosedRange<Int>>
 #  141| [ConcreteVarDecl] $match
 #  141|     Type = Int
 #  141| [ConcreteVarDecl] $match
@@ -3259,6 +3259,10 @@ cfg.swift:
 #  525|                   getExpr(): [ExplicitClosureExpr] { ... }
 #  525|                     getBody(): [BraceStmt] { ... }
 #  526|                       getElement(0): [ForEachStmt] for ... in ... { ... }
+#  526|                         getVariable(0): [ConcreteVarDecl] i
+#  526|                             Type = Int
+#  526|                         getVariable(1): [ConcreteVarDecl] $i$generator
+#  526|                             Type = IndexingIterator<ClosedRange<Int>>
 #  526|                         getPattern(): [NamedPattern] i
 #-----|                         getIteratorVar(): [PatternBindingDecl] var ... = ...
 #  526|                           getInit(0): [CallExpr] call to makeIterator()
@@ -3294,6 +3298,10 @@ cfg.swift:
 #  525|                   getExpr().getFullyConverted(): [FunctionConversionExpr] (@isolated(any) () async -> ()) ...
 #  523|       getPattern(0): [NamedPattern] stream
 #  533|     getElement(1): [ForEachStmt] for ... in ... { ... }
+#  533|       getVariable(0): [ConcreteVarDecl] i
+#  533|           Type = Int
+#  533|       getVariable(1): [ConcreteVarDecl] $i$generator
+#  533|           Type = AsyncStream<Int>.Iterator
 #  533|       getPattern(): [NamedPattern] i
 #-----|       getIteratorVar(): [PatternBindingDecl] var ... = ...
 #  533|         getInit(0): [CallExpr] call to makeAsyncIterator()
@@ -3302,11 +3310,12 @@ cfg.swift:
 #  533|             getBase().getFullyConverted(): [LoadExpr] (AsyncStream<Int>) ...
 #-----|             getMethodRef(): [DeclRefExpr] makeAsyncIterator()
 #  533|         getPattern(0): [NamedPattern] $i$generator
-#  533|       getNextCall(): [CallExpr] call to next()
-#  533|         getFunction(): [MethodLookupExpr] .next()
+#  533|       getNextCall(): [CallExpr] call to next(isolation:)
+#  533|         getFunction(): [MethodLookupExpr] .next(isolation:)
 #  533|           getBase(): [DeclRefExpr] $i$generator
 #  533|           getBase().getFullyConverted(): [InOutExpr] &...
-#-----|           getMethodRef(): [DeclRefExpr] next()
+#-----|           getMethodRef(): [DeclRefExpr] next(isolation:)
+#  533|         getArgument(0): (no string representation)
 #  533|       getNextCall().getFullyConverted(): [AwaitExpr] await ...
 #  533|       getBody(): [BraceStmt] { ... }
 #  534|         getElement(0): [CallExpr] call to print(_:separator:terminator:)
@@ -3321,14 +3330,6 @@ cfg.swift:
 #  534|           getArgument(2): [Argument] terminator: default terminator
 #  534|             getExpr(): [DefaultArgumentExpr] default terminator
 #  525| [NilLiteralExpr] nil
-#  526| [ConcreteVarDecl] i
-#  526|     Type = Int
-#  526| [ConcreteVarDecl] $i$generator
-#  526|     Type = IndexingIterator<ClosedRange<Int>>
-#  533| [ConcreteVarDecl] i
-#  533|     Type = Int
-#  533| [ConcreteVarDecl] $i$generator
-#  533|     Type = AsyncStream<Int>.Iterator
 #  538| [NamedFunction] testNilCoalescing(x:)
 #  538|     InterfaceType = (Int?) -> Int
 #  538|   getParam(0): [ParamDecl] x
@@ -6936,6 +6937,10 @@ statements.swift:
 #    9|     getVariable(0): [ConcreteVarDecl] i
 #    9|         Type = Int
 #    2|     getElement(0): [ForEachStmt] for ... in ... { ... }
+#    2|       getVariable(0): [ConcreteVarDecl] i
+#    2|           Type = Int
+#    2|       getVariable(1): [ConcreteVarDecl] $i$generator
+#    2|           Type = IndexingIterator<ClosedRange<Int>>
 #    2|       getPattern(): [NamedPattern] i
 #-----|       getIteratorVar(): [PatternBindingDecl] var ... = ...
 #    2|         getInit(0): [CallExpr] call to makeIterator()
@@ -7097,10 +7102,6 @@ statements.swift:
 #   30|               getExpr(): [DefaultArgumentExpr] default separator
 #   30|             getArgument(2): [Argument] terminator: default terminator
 #   30|               getExpr(): [DefaultArgumentExpr] default terminator
-#    2| [ConcreteVarDecl] i
-#    2|     Type = Int
-#    2| [ConcreteVarDecl] $i$generator
-#    2|     Type = IndexingIterator<ClosedRange<Int>>
 #   34| [EnumDecl] AnError
 #   35|   getMember(0): [EnumCaseDecl] case ...
 #   35|   getMember(1): [EnumElementDecl] failed
@@ -7371,6 +7372,10 @@ statements.swift:
 #   71| [TopLevelCodeDecl] { ... }
 #   71|   getBody(): [BraceStmt] { ... }
 #   71|     getElement(0): [ForEachStmt] for ... in ... where ... { ... }
+#   71|       getVariable(0): [ConcreteVarDecl] number
+#   71|           Type = Int
+#   71|       getVariable(1): [ConcreteVarDecl] $number$generator
+#   71|           Type = IndexingIterator<[Int]>
 #   71|       getPattern(): [NamedPattern] number
 #   71|       getWhere(): [BinaryExpr] ... .==(_:_:) ...
 #   71|         getFunction(): [MethodLookupExpr] .==(_:_:)
@@ -7401,10 +7406,6 @@ statements.swift:
 #   71|           getBase().getFullyConverted(): [InOutExpr] &...
 #-----|           getMethodRef(): [DeclRefExpr] next()
 #   71|       getBody(): [BraceStmt] { ... }
-#   71| [ConcreteVarDecl] number
-#   71|     Type = Int
-#   71| [ConcreteVarDecl] $number$generator
-#   71|     Type = IndexingIterator<[Int]>
 #   74| [StructDecl] HasModifyAccessorDecl
 #   75|   getMember(0): [PatternBindingDecl] var ... = ...
 #   75|     getPattern(0): [TypedPattern] ... as ...