diff --git a/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected b/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected
index ddf1114d042..8efe10c62b6 100644
--- a/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected
+++ b/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected
@@ -519,25 +519,25 @@ edges
 | test.swift:841:13:841:13 | s2 [s, x] | test.swift:841:13:841:16 | .s [x] |
 | test.swift:841:13:841:16 | .s [x] | test.swift:615:7:615:7 | self [x] |
 | test.swift:841:13:841:16 | .s [x] | test.swift:841:13:841:18 | .x |
-| test.swift:844:19:844:28 | args [Array element] | test.swift:846:15:846:15 | args [Array element] |
-| test.swift:846:15:846:15 | args [Array element] | test.swift:846:15:846:21 | ...[...] |
+| test.swift:844:19:844:28 | args [Collection element] | test.swift:846:15:846:15 | args [Collection element] |
+| test.swift:846:15:846:15 | args [Collection element] | test.swift:846:15:846:21 | ...[...] |
 | test.swift:849:19:849:24 | v | test.swift:850:15:850:15 | v |
-| test.swift:856:29:856:40 | args [Array element] | test.swift:859:15:859:15 | args [Array element] |
-| test.swift:856:29:856:40 | args [Array element] | test.swift:860:15:860:15 | args [Array element] |
-| test.swift:856:29:856:40 | args [Array element] | test.swift:867:15:867:15 | args [Array element] |
-| test.swift:859:15:859:15 | args [Array element] | test.swift:859:15:859:21 | ...[...] |
-| test.swift:860:15:860:15 | args [Array element] | test.swift:860:15:860:21 | ...[...] |
-| test.swift:866:21:866:29 | enter #keyPath(...) [Array element] | test.swift:866:27:866:29 | KeyPathComponent [Array element] |
-| test.swift:866:27:866:29 | KeyPathComponent [Array element] | test.swift:866:21:866:29 | exit #keyPath(...) |
-| test.swift:867:15:867:15 | args [Array element] | test.swift:866:21:866:29 | enter #keyPath(...) [Array element] |
-| test.swift:867:15:867:15 | args [Array element] | test.swift:867:15:867:38 | \\...[...] |
-| test.swift:871:24:871:31 | [...] [Array element] | test.swift:844:19:844:28 | args [Array element] |
-| test.swift:871:24:871:31 | [...] [Array element] | test.swift:871:24:871:31 | [...] [Array element] |
-| test.swift:871:24:871:31 | call to source() | test.swift:871:24:871:31 | [...] [Array element] |
+| test.swift:856:29:856:40 | args [Collection element] | test.swift:859:15:859:15 | args [Collection element] |
+| test.swift:856:29:856:40 | args [Collection element] | test.swift:860:15:860:15 | args [Collection element] |
+| test.swift:856:29:856:40 | args [Collection element] | test.swift:867:15:867:15 | args [Collection element] |
+| test.swift:859:15:859:15 | args [Collection element] | test.swift:859:15:859:21 | ...[...] |
+| test.swift:860:15:860:15 | args [Collection element] | test.swift:860:15:860:21 | ...[...] |
+| test.swift:866:21:866:29 | enter #keyPath(...) [Collection element] | test.swift:866:27:866:29 | KeyPathComponent [Collection element] |
+| test.swift:866:27:866:29 | KeyPathComponent [Collection element] | test.swift:866:21:866:29 | exit #keyPath(...) |
+| test.swift:867:15:867:15 | args [Collection element] | test.swift:866:21:866:29 | enter #keyPath(...) [Collection element] |
+| test.swift:867:15:867:15 | args [Collection element] | test.swift:867:15:867:38 | \\...[...] |
+| test.swift:871:24:871:31 | [...] [Collection element] | test.swift:844:19:844:28 | args [Collection element] |
+| test.swift:871:24:871:31 | [...] [Collection element] | test.swift:871:24:871:31 | [...] [Collection element] |
+| test.swift:871:24:871:31 | call to source() | test.swift:871:24:871:31 | [...] [Collection element] |
 | test.swift:872:18:872:25 | call to source() | test.swift:849:19:849:24 | v |
-| test.swift:873:21:873:31 | [...] [Array element] | test.swift:856:29:856:40 | args [Array element] |
-| test.swift:873:21:873:31 | [...] [Array element] | test.swift:873:21:873:31 | [...] [Array element] |
-| test.swift:873:24:873:31 | call to source() | test.swift:873:21:873:31 | [...] [Array element] |
+| test.swift:873:21:873:31 | [...] [Collection element] | test.swift:856:29:856:40 | args [Collection element] |
+| test.swift:873:21:873:31 | [...] [Collection element] | test.swift:873:21:873:31 | [...] [Collection element] |
+| test.swift:873:24:873:31 | call to source() | test.swift:873:21:873:31 | [...] [Collection element] |
 nodes
 | file://:0:0:0:0 | .a [x] | semmle.label | .a [x] |
 | file://:0:0:0:0 | .s [x] | semmle.label | .s [x] |
@@ -1101,27 +1101,27 @@ nodes
 | test.swift:841:13:841:13 | s2 [s, x] | semmle.label | s2 [s, x] |
 | test.swift:841:13:841:16 | .s [x] | semmle.label | .s [x] |
 | test.swift:841:13:841:18 | .x | semmle.label | .x |
-| test.swift:844:19:844:28 | args [Array element] | semmle.label | args [Array element] |
-| test.swift:846:15:846:15 | args [Array element] | semmle.label | args [Array element] |
+| test.swift:844:19:844:28 | args [Collection element] | semmle.label | args [Collection element] |
+| test.swift:846:15:846:15 | args [Collection element] | semmle.label | args [Collection element] |
 | test.swift:846:15:846:21 | ...[...] | semmle.label | ...[...] |
 | test.swift:849:19:849:24 | v | semmle.label | v |
 | test.swift:850:15:850:15 | v | semmle.label | v |
-| test.swift:856:29:856:40 | args [Array element] | semmle.label | args [Array element] |
-| test.swift:859:15:859:15 | args [Array element] | semmle.label | args [Array element] |
+| test.swift:856:29:856:40 | args [Collection element] | semmle.label | args [Collection element] |
+| test.swift:859:15:859:15 | args [Collection element] | semmle.label | args [Collection element] |
 | test.swift:859:15:859:21 | ...[...] | semmle.label | ...[...] |
-| test.swift:860:15:860:15 | args [Array element] | semmle.label | args [Array element] |
+| test.swift:860:15:860:15 | args [Collection element] | semmle.label | args [Collection element] |
 | test.swift:860:15:860:21 | ...[...] | semmle.label | ...[...] |
-| test.swift:866:21:866:29 | enter #keyPath(...) [Array element] | semmle.label | enter #keyPath(...) [Array element] |
+| test.swift:866:21:866:29 | enter #keyPath(...) [Collection element] | semmle.label | enter #keyPath(...) [Collection element] |
 | test.swift:866:21:866:29 | exit #keyPath(...) | semmle.label | exit #keyPath(...) |
-| test.swift:866:27:866:29 | KeyPathComponent [Array element] | semmle.label | KeyPathComponent [Array element] |
-| test.swift:867:15:867:15 | args [Array element] | semmle.label | args [Array element] |
+| test.swift:866:27:866:29 | KeyPathComponent [Collection element] | semmle.label | KeyPathComponent [Collection element] |
+| test.swift:867:15:867:15 | args [Collection element] | semmle.label | args [Collection element] |
 | test.swift:867:15:867:38 | \\...[...] | semmle.label | \\...[...] |
-| test.swift:871:24:871:31 | [...] [Array element] | semmle.label | [...] [Array element] |
-| test.swift:871:24:871:31 | [...] [Array element] | semmle.label | [...] [Array element] |
+| test.swift:871:24:871:31 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| test.swift:871:24:871:31 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | test.swift:871:24:871:31 | call to source() | semmle.label | call to source() |
 | test.swift:872:18:872:25 | call to source() | semmle.label | call to source() |
-| test.swift:873:21:873:31 | [...] [Array element] | semmle.label | [...] [Array element] |
-| test.swift:873:21:873:31 | [...] [Array element] | semmle.label | [...] [Array element] |
+| test.swift:873:21:873:31 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| test.swift:873:21:873:31 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | test.swift:873:24:873:31 | call to source() | semmle.label | call to source() |
 subpaths
 | test.swift:75:22:75:22 | x | test.swift:65:16:65:28 | arg1 | test.swift:65:1:70:1 | arg2[return] | test.swift:75:32:75:32 | [post] y |
@@ -1188,7 +1188,7 @@ subpaths
 | test.swift:840:3:840:16 | \\...[...] | test.swift:839:11:839:17 | [post] exit #keyPath(...) | test.swift:839:15:839:15 | [post] KeyPathComponent [s, x] | test.swift:840:3:840:3 | [post] s2 [s, x] |
 | test.swift:841:13:841:13 | s2 [s, x] | test.swift:632:7:632:7 | self [s, x] | file://:0:0:0:0 | .s [x] | test.swift:841:13:841:16 | .s [x] |
 | test.swift:841:13:841:16 | .s [x] | test.swift:615:7:615:7 | self [x] | file://:0:0:0:0 | .x | test.swift:841:13:841:18 | .x |
-| test.swift:867:15:867:15 | args [Array element] | test.swift:866:21:866:29 | enter #keyPath(...) [Array element] | test.swift:866:21:866:29 | exit #keyPath(...) | test.swift:867:15:867:38 | \\...[...] |
+| test.swift:867:15:867:15 | args [Collection element] | test.swift:866:21:866:29 | enter #keyPath(...) [Collection element] | test.swift:866:21:866:29 | exit #keyPath(...) | test.swift:867:15:867:38 | \\...[...] |
 #select
 | test.swift:7:15:7:15 | t1 | test.swift:6:19:6:26 | call to source() | test.swift:7:15:7:15 | t1 | result |
 | test.swift:9:15:9:15 | t1 | test.swift:6:19:6:26 | call to source() | test.swift:9:15:9:15 | t1 | result |