diff --git a/powershell/ql/test/library-tests/dataflow/local/test.expected b/powershell/ql/test/library-tests/dataflow/local/test.expected
index 9cd51701d9d..d559f89502a 100644
--- a/powershell/ql/test/library-tests/dataflow/local/test.expected
+++ b/powershell/ql/test/library-tests/dataflow/local/test.expected
@@ -1,6 +1,9 @@
 | test.ps1:1:1:1:4 | a1 | test.ps1:2:6:2:9 | a1 |
 | test.ps1:1:7:1:13 | Source | test.ps1:1:1:1:4 | a1 |
 | test.ps1:1:7:1:13 | Source | test.ps1:1:1:1:13 | ...=... |
+| test.ps1:2:1:2:9 | Sink | test.ps1:2:1:2:9 | implicit unwrapping of Sink |
+| test.ps1:2:1:2:9 | Sink | test.ps1:2:1:2:9 | implicit unwrapping of Sink |
+| test.ps1:2:1:2:9 | implicit unwrapping of Sink | test.ps1:1:1:8:9 | return value for test.ps1 |
 | test.ps1:4:1:4:3 | b | test.ps1:5:4:5:6 | b |
 | test.ps1:4:6:4:13 | GetBool | test.ps1:4:1:4:3 | b |
 | test.ps1:4:6:4:13 | GetBool | test.ps1:4:1:4:13 | ...=... |
@@ -8,3 +11,6 @@
 | test.ps1:6:5:6:8 | a2 | test.ps1:8:6:8:9 | a2 |
 | test.ps1:6:11:6:17 | Source | test.ps1:6:5:6:8 | a2 |
 | test.ps1:6:11:6:17 | Source | test.ps1:6:5:6:17 | ...=... |
+| test.ps1:8:1:8:9 | Sink | test.ps1:8:1:8:9 | implicit unwrapping of Sink |
+| test.ps1:8:1:8:9 | Sink | test.ps1:8:1:8:9 | implicit unwrapping of Sink |
+| test.ps1:8:1:8:9 | implicit unwrapping of Sink | test.ps1:1:1:8:9 | return value for test.ps1 |
diff --git a/powershell/ql/test/library-tests/dataflow/returns/test.expected b/powershell/ql/test/library-tests/dataflow/returns/test.expected
index dbd31969033..e851cb13654 100644
--- a/powershell/ql/test/library-tests/dataflow/returns/test.expected
+++ b/powershell/ql/test/library-tests/dataflow/returns/test.expected
@@ -1,32 +1,48 @@
 models
 edges
-| test.ps1:2:5:2:15 | Source | test.ps1:5:6:5:20 | callSourceOnce | provenance |  |
+| test.ps1:1:25:3:2 | return value for {...} | test.ps1:5:6:5:20 | callSourceOnce | provenance |  |
+| test.ps1:2:5:2:15 | Source | test.ps1:2:5:2:15 | implicit unwrapping of Source | provenance |  |
+| test.ps1:2:5:2:15 | implicit unwrapping of Source | test.ps1:1:25:3:2 | return value for {...} | provenance |  |
 | test.ps1:5:6:5:20 | callSourceOnce | test.ps1:6:6:6:8 | x | provenance |  |
-| test.ps1:9:5:9:15 | Source | test.ps1:13:6:13:21 | callSourceTwice | provenance |  |
-| test.ps1:10:5:10:15 | Source | test.ps1:13:6:13:21 | callSourceTwice | provenance |  |
+| test.ps1:8:26:11:2 | return value for {...} | test.ps1:13:6:13:21 | callSourceTwice | provenance |  |
+| test.ps1:9:5:9:15 | Source | test.ps1:9:5:9:15 | implicit unwrapping of Source | provenance |  |
+| test.ps1:9:5:9:15 | implicit unwrapping of Source | test.ps1:8:26:11:2 | return value for {...} | provenance |  |
+| test.ps1:10:5:10:15 | Source | test.ps1:10:5:10:15 | implicit unwrapping of Source | provenance |  |
+| test.ps1:10:5:10:15 | implicit unwrapping of Source | test.ps1:8:26:11:2 | return value for {...} | provenance |  |
 | test.ps1:13:6:13:21 | callSourceTwice | test.ps1:14:6:14:8 | x | provenance |  |
-| test.ps1:17:12:17:22 | Source | test.ps1:20:6:20:19 | returnSource1 | provenance |  |
+| test.ps1:16:24:18:2 | return value for {...} | test.ps1:20:6:20:19 | returnSource1 | provenance |  |
+| test.ps1:17:12:17:22 | Source | test.ps1:17:12:17:22 | implicit unwrapping of Source | provenance |  |
+| test.ps1:17:12:17:22 | implicit unwrapping of Source | test.ps1:16:24:18:2 | return value for {...} | provenance |  |
 | test.ps1:20:6:20:19 | returnSource1 | test.ps1:21:6:21:8 | x | provenance |  |
-| test.ps1:24:10:24:20 | Source | test.ps1:25:5:25:7 | x | provenance |  |
-| test.ps1:25:5:25:7 | x | test.ps1:30:6:30:19 | returnSource2 | provenance |  |
-| test.ps1:26:10:26:20 | Source | test.ps1:27:12:27:14 | y | provenance |  |
-| test.ps1:27:12:27:14 | y | test.ps1:30:6:30:19 | returnSource2 | provenance |  |
+| test.ps1:23:24:28:2 | return value for {...} | test.ps1:30:6:30:19 | returnSource2 | provenance |  |
+| test.ps1:24:10:24:20 | Source | test.ps1:25:5:25:7 | implicit unwrapping of x | provenance |  |
+| test.ps1:25:5:25:7 | implicit unwrapping of x | test.ps1:23:24:28:2 | return value for {...} | provenance |  |
+| test.ps1:26:10:26:20 | Source | test.ps1:27:12:27:14 | implicit unwrapping of y | provenance |  |
+| test.ps1:27:12:27:14 | implicit unwrapping of y | test.ps1:23:24:28:2 | return value for {...} | provenance |  |
 | test.ps1:30:6:30:19 | returnSource2 | test.ps1:31:6:31:8 | x | provenance |  |
 nodes
+| test.ps1:1:25:3:2 | return value for {...} | semmle.label | return value for {...} |
 | test.ps1:2:5:2:15 | Source | semmle.label | Source |
+| test.ps1:2:5:2:15 | implicit unwrapping of Source | semmle.label | implicit unwrapping of Source |
 | test.ps1:5:6:5:20 | callSourceOnce | semmle.label | callSourceOnce |
 | test.ps1:6:6:6:8 | x | semmle.label | x |
+| test.ps1:8:26:11:2 | return value for {...} | semmle.label | return value for {...} |
 | test.ps1:9:5:9:15 | Source | semmle.label | Source |
+| test.ps1:9:5:9:15 | implicit unwrapping of Source | semmle.label | implicit unwrapping of Source |
 | test.ps1:10:5:10:15 | Source | semmle.label | Source |
+| test.ps1:10:5:10:15 | implicit unwrapping of Source | semmle.label | implicit unwrapping of Source |
 | test.ps1:13:6:13:21 | callSourceTwice | semmle.label | callSourceTwice |
 | test.ps1:14:6:14:8 | x | semmle.label | x |
+| test.ps1:16:24:18:2 | return value for {...} | semmle.label | return value for {...} |
 | test.ps1:17:12:17:22 | Source | semmle.label | Source |
+| test.ps1:17:12:17:22 | implicit unwrapping of Source | semmle.label | implicit unwrapping of Source |
 | test.ps1:20:6:20:19 | returnSource1 | semmle.label | returnSource1 |
 | test.ps1:21:6:21:8 | x | semmle.label | x |
+| test.ps1:23:24:28:2 | return value for {...} | semmle.label | return value for {...} |
 | test.ps1:24:10:24:20 | Source | semmle.label | Source |
-| test.ps1:25:5:25:7 | x | semmle.label | x |
+| test.ps1:25:5:25:7 | implicit unwrapping of x | semmle.label | implicit unwrapping of x |
 | test.ps1:26:10:26:20 | Source | semmle.label | Source |
-| test.ps1:27:12:27:14 | y | semmle.label | y |
+| test.ps1:27:12:27:14 | implicit unwrapping of y | semmle.label | implicit unwrapping of y |
 | test.ps1:30:6:30:19 | returnSource2 | semmle.label | returnSource2 |
 | test.ps1:31:6:31:8 | x | semmle.label | x |
 subpaths