diff --git a/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected b/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected
index 4fdf1eef866..204092c6df2 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected
@@ -789,25 +789,25 @@ dominance
 | Assignments.cs:41:9:41:30 | call to method SetParamSingle | Assignments.cs:42:9:42:37 | ...; |
 | Assignments.cs:41:9:41:30 | this access | Assignments.cs:41:9:41:30 | call to method SetParamSingle |
 | Assignments.cs:41:9:41:31 | ...; | Assignments.cs:41:9:41:30 | this access |
-| Assignments.cs:42:9:42:36 | call to method SetParamSingle | Assignments.cs:42:28:42:35 | access to field IntField |
+| Assignments.cs:42:9:42:36 | call to method SetParamSingle | Assignments.cs:43:9:43:56 | ...; |
 | Assignments.cs:42:9:42:36 | this access | Assignments.cs:42:28:42:35 | this access |
 | Assignments.cs:42:9:42:37 | ...; | Assignments.cs:42:9:42:36 | this access |
-| Assignments.cs:42:28:42:35 | access to field IntField | Assignments.cs:43:9:43:56 | ...; |
-| Assignments.cs:42:28:42:35 | this access | Assignments.cs:42:9:42:36 | call to method SetParamSingle |
-| Assignments.cs:43:9:43:55 | call to method SetParamMulti | Assignments.cs:43:44:43:54 | access to field StringField |
+| Assignments.cs:42:28:42:35 | access to field IntField | Assignments.cs:42:9:42:36 | call to method SetParamSingle |
+| Assignments.cs:42:28:42:35 | this access | Assignments.cs:42:28:42:35 | access to field IntField |
+| Assignments.cs:43:9:43:55 | call to method SetParamMulti | Assignments.cs:44:9:44:59 | ...; |
 | Assignments.cs:43:9:43:55 | this access | Assignments.cs:43:34:43:37 | null |
 | Assignments.cs:43:9:43:56 | ...; | Assignments.cs:43:9:43:55 | this access |
 | Assignments.cs:43:34:43:37 | null | Assignments.cs:43:44:43:54 | this access |
-| Assignments.cs:43:44:43:54 | access to field StringField | Assignments.cs:44:9:44:59 | ...; |
-| Assignments.cs:43:44:43:54 | this access | Assignments.cs:43:9:43:55 | call to method SetParamMulti |
-| Assignments.cs:44:9:44:58 | call to method SetParamMulti | Assignments.cs:44:27:44:34 | access to field IntField |
+| Assignments.cs:43:44:43:54 | access to field StringField | Assignments.cs:43:9:43:55 | call to method SetParamMulti |
+| Assignments.cs:43:44:43:54 | this access | Assignments.cs:43:44:43:54 | access to field StringField |
+| Assignments.cs:44:9:44:58 | call to method SetParamMulti | Assignments.cs:38:10:38:11 | exit M2 (normal) |
 | Assignments.cs:44:9:44:58 | this access | Assignments.cs:44:27:44:34 | this access |
 | Assignments.cs:44:9:44:59 | ...; | Assignments.cs:44:9:44:58 | this access |
-| Assignments.cs:44:27:44:34 | access to field IntField | Assignments.cs:44:47:44:57 | access to field StringField |
-| Assignments.cs:44:27:44:34 | this access | Assignments.cs:44:37:44:40 | null |
+| Assignments.cs:44:27:44:34 | access to field IntField | Assignments.cs:44:37:44:40 | null |
+| Assignments.cs:44:27:44:34 | this access | Assignments.cs:44:27:44:34 | access to field IntField |
 | Assignments.cs:44:37:44:40 | null | Assignments.cs:44:47:44:57 | this access |
-| Assignments.cs:44:47:44:57 | access to field StringField | Assignments.cs:38:10:38:11 | exit M2 (normal) |
-| Assignments.cs:44:47:44:57 | this access | Assignments.cs:44:9:44:58 | call to method SetParamMulti |
+| Assignments.cs:44:47:44:57 | access to field StringField | Assignments.cs:44:9:44:58 | call to method SetParamMulti |
+| Assignments.cs:44:47:44:57 | this access | Assignments.cs:44:47:44:57 | access to field StringField |
 | BreakInTry.cs:1:7:1:16 | call to constructor Object | BreakInTry.cs:1:7:1:16 | {...} |
 | BreakInTry.cs:1:7:1:16 | call to method <object initializer> | BreakInTry.cs:1:7:1:16 | call to constructor Object |
 | BreakInTry.cs:1:7:1:16 | enter BreakInTry | BreakInTry.cs:1:7:1:16 | this access |
@@ -4780,31 +4780,31 @@ postDominance
 | Assignments.cs:35:9:35:20 | ...; | Assignments.cs:34:9:34:14 | ... = ... |
 | Assignments.cs:35:13:35:19 | "Hello" | Assignments.cs:35:9:35:20 | ...; |
 | Assignments.cs:38:10:38:11 | exit M2 | Assignments.cs:38:10:38:11 | exit M2 (normal) |
-| Assignments.cs:38:10:38:11 | exit M2 (normal) | Assignments.cs:44:47:44:57 | access to field StringField |
+| Assignments.cs:38:10:38:11 | exit M2 (normal) | Assignments.cs:44:9:44:58 | call to method SetParamMulti |
 | Assignments.cs:39:5:45:5 | {...} | Assignments.cs:38:10:38:11 | enter M2 |
 | Assignments.cs:40:9:40:15 | ... ...; | Assignments.cs:39:5:45:5 | {...} |
 | Assignments.cs:40:13:40:14 | Int32 x1 | Assignments.cs:40:9:40:15 | ... ...; |
 | Assignments.cs:41:9:41:30 | call to method SetParamSingle | Assignments.cs:41:9:41:30 | this access |
 | Assignments.cs:41:9:41:30 | this access | Assignments.cs:41:9:41:31 | ...; |
 | Assignments.cs:41:9:41:31 | ...; | Assignments.cs:40:13:40:14 | Int32 x1 |
-| Assignments.cs:42:9:42:36 | call to method SetParamSingle | Assignments.cs:42:28:42:35 | this access |
+| Assignments.cs:42:9:42:36 | call to method SetParamSingle | Assignments.cs:42:28:42:35 | access to field IntField |
 | Assignments.cs:42:9:42:36 | this access | Assignments.cs:42:9:42:37 | ...; |
 | Assignments.cs:42:9:42:37 | ...; | Assignments.cs:41:9:41:30 | call to method SetParamSingle |
-| Assignments.cs:42:28:42:35 | access to field IntField | Assignments.cs:42:9:42:36 | call to method SetParamSingle |
+| Assignments.cs:42:28:42:35 | access to field IntField | Assignments.cs:42:28:42:35 | this access |
 | Assignments.cs:42:28:42:35 | this access | Assignments.cs:42:9:42:36 | this access |
-| Assignments.cs:43:9:43:55 | call to method SetParamMulti | Assignments.cs:43:44:43:54 | this access |
+| Assignments.cs:43:9:43:55 | call to method SetParamMulti | Assignments.cs:43:44:43:54 | access to field StringField |
 | Assignments.cs:43:9:43:55 | this access | Assignments.cs:43:9:43:56 | ...; |
-| Assignments.cs:43:9:43:56 | ...; | Assignments.cs:42:28:42:35 | access to field IntField |
+| Assignments.cs:43:9:43:56 | ...; | Assignments.cs:42:9:42:36 | call to method SetParamSingle |
 | Assignments.cs:43:34:43:37 | null | Assignments.cs:43:9:43:55 | this access |
-| Assignments.cs:43:44:43:54 | access to field StringField | Assignments.cs:43:9:43:55 | call to method SetParamMulti |
+| Assignments.cs:43:44:43:54 | access to field StringField | Assignments.cs:43:44:43:54 | this access |
 | Assignments.cs:43:44:43:54 | this access | Assignments.cs:43:34:43:37 | null |
-| Assignments.cs:44:9:44:58 | call to method SetParamMulti | Assignments.cs:44:47:44:57 | this access |
+| Assignments.cs:44:9:44:58 | call to method SetParamMulti | Assignments.cs:44:47:44:57 | access to field StringField |
 | Assignments.cs:44:9:44:58 | this access | Assignments.cs:44:9:44:59 | ...; |
-| Assignments.cs:44:9:44:59 | ...; | Assignments.cs:43:44:43:54 | access to field StringField |
-| Assignments.cs:44:27:44:34 | access to field IntField | Assignments.cs:44:9:44:58 | call to method SetParamMulti |
+| Assignments.cs:44:9:44:59 | ...; | Assignments.cs:43:9:43:55 | call to method SetParamMulti |
+| Assignments.cs:44:27:44:34 | access to field IntField | Assignments.cs:44:27:44:34 | this access |
 | Assignments.cs:44:27:44:34 | this access | Assignments.cs:44:9:44:58 | this access |
-| Assignments.cs:44:37:44:40 | null | Assignments.cs:44:27:44:34 | this access |
-| Assignments.cs:44:47:44:57 | access to field StringField | Assignments.cs:44:27:44:34 | access to field IntField |
+| Assignments.cs:44:37:44:40 | null | Assignments.cs:44:27:44:34 | access to field IntField |
+| Assignments.cs:44:47:44:57 | access to field StringField | Assignments.cs:44:47:44:57 | this access |
 | Assignments.cs:44:47:44:57 | this access | Assignments.cs:44:37:44:40 | null |
 | BreakInTry.cs:1:7:1:16 | call to constructor Object | BreakInTry.cs:1:7:1:16 | call to method <object initializer> |
 | BreakInTry.cs:1:7:1:16 | call to method <object initializer> | BreakInTry.cs:1:7:1:16 | this access |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected b/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected
index decfe3f3cfe..a6794112ebd 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected
@@ -832,30 +832,30 @@
 | Assignments.cs:35:9:35:19 | ... = ... | Assignments.cs:35:9:35:19 | ... = ... | normal |
 | Assignments.cs:35:9:35:20 | ...; | Assignments.cs:35:9:35:19 | ... = ... | normal |
 | Assignments.cs:35:13:35:19 | "Hello" | Assignments.cs:35:13:35:19 | "Hello" | normal |
-| Assignments.cs:39:5:45:5 | {...} | Assignments.cs:44:47:44:57 | access to field StringField | normal |
+| Assignments.cs:39:5:45:5 | {...} | Assignments.cs:44:9:44:58 | call to method SetParamMulti | normal |
 | Assignments.cs:40:9:40:15 | ... ...; | Assignments.cs:40:13:40:14 | Int32 x1 | normal |
 | Assignments.cs:40:13:40:14 | Int32 x1 | Assignments.cs:40:13:40:14 | Int32 x1 | normal |
 | Assignments.cs:41:9:41:30 | call to method SetParamSingle | Assignments.cs:41:9:41:30 | call to method SetParamSingle | normal |
 | Assignments.cs:41:9:41:30 | this access | Assignments.cs:41:9:41:30 | this access | normal |
 | Assignments.cs:41:9:41:31 | ...; | Assignments.cs:41:9:41:30 | call to method SetParamSingle | normal |
-| Assignments.cs:42:9:42:36 | call to method SetParamSingle | Assignments.cs:42:28:42:35 | access to field IntField | normal |
+| Assignments.cs:42:9:42:36 | call to method SetParamSingle | Assignments.cs:42:9:42:36 | call to method SetParamSingle | normal |
 | Assignments.cs:42:9:42:36 | this access | Assignments.cs:42:9:42:36 | this access | normal |
-| Assignments.cs:42:9:42:37 | ...; | Assignments.cs:42:28:42:35 | access to field IntField | normal |
-| Assignments.cs:42:28:42:35 | access to field IntField | Assignments.cs:42:28:42:35 | this access | normal |
+| Assignments.cs:42:9:42:37 | ...; | Assignments.cs:42:9:42:36 | call to method SetParamSingle | normal |
+| Assignments.cs:42:28:42:35 | access to field IntField | Assignments.cs:42:28:42:35 | access to field IntField | normal |
 | Assignments.cs:42:28:42:35 | this access | Assignments.cs:42:28:42:35 | this access | normal |
-| Assignments.cs:43:9:43:55 | call to method SetParamMulti | Assignments.cs:43:44:43:54 | access to field StringField | normal |
+| Assignments.cs:43:9:43:55 | call to method SetParamMulti | Assignments.cs:43:9:43:55 | call to method SetParamMulti | normal |
 | Assignments.cs:43:9:43:55 | this access | Assignments.cs:43:9:43:55 | this access | normal |
-| Assignments.cs:43:9:43:56 | ...; | Assignments.cs:43:44:43:54 | access to field StringField | normal |
+| Assignments.cs:43:9:43:56 | ...; | Assignments.cs:43:9:43:55 | call to method SetParamMulti | normal |
 | Assignments.cs:43:34:43:37 | null | Assignments.cs:43:34:43:37 | null | normal |
-| Assignments.cs:43:44:43:54 | access to field StringField | Assignments.cs:43:44:43:54 | this access | normal |
+| Assignments.cs:43:44:43:54 | access to field StringField | Assignments.cs:43:44:43:54 | access to field StringField | normal |
 | Assignments.cs:43:44:43:54 | this access | Assignments.cs:43:44:43:54 | this access | normal |
-| Assignments.cs:44:9:44:58 | call to method SetParamMulti | Assignments.cs:44:47:44:57 | access to field StringField | normal |
+| Assignments.cs:44:9:44:58 | call to method SetParamMulti | Assignments.cs:44:9:44:58 | call to method SetParamMulti | normal |
 | Assignments.cs:44:9:44:58 | this access | Assignments.cs:44:9:44:58 | this access | normal |
-| Assignments.cs:44:9:44:59 | ...; | Assignments.cs:44:47:44:57 | access to field StringField | normal |
-| Assignments.cs:44:27:44:34 | access to field IntField | Assignments.cs:44:27:44:34 | this access | normal |
+| Assignments.cs:44:9:44:59 | ...; | Assignments.cs:44:9:44:58 | call to method SetParamMulti | normal |
+| Assignments.cs:44:27:44:34 | access to field IntField | Assignments.cs:44:27:44:34 | access to field IntField | normal |
 | Assignments.cs:44:27:44:34 | this access | Assignments.cs:44:27:44:34 | this access | normal |
 | Assignments.cs:44:37:44:40 | null | Assignments.cs:44:37:44:40 | null | normal |
-| Assignments.cs:44:47:44:57 | access to field StringField | Assignments.cs:44:47:44:57 | this access | normal |
+| Assignments.cs:44:47:44:57 | access to field StringField | Assignments.cs:44:47:44:57 | access to field StringField | normal |
 | Assignments.cs:44:47:44:57 | this access | Assignments.cs:44:47:44:57 | this access | normal |
 | BreakInTry.cs:1:7:1:16 | call to constructor Object | BreakInTry.cs:1:7:1:16 | call to constructor Object | normal |
 | BreakInTry.cs:1:7:1:16 | call to method <object initializer> | BreakInTry.cs:1:7:1:16 | call to method <object initializer> | normal |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
index b8ccee34f7e..4ce98d5096f 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
@@ -876,25 +876,25 @@
 | Assignments.cs:41:9:41:30 | call to method SetParamSingle | Assignments.cs:42:9:42:37 | ...; |  |
 | Assignments.cs:41:9:41:30 | this access | Assignments.cs:41:9:41:30 | call to method SetParamSingle |  |
 | Assignments.cs:41:9:41:31 | ...; | Assignments.cs:41:9:41:30 | this access |  |
-| Assignments.cs:42:9:42:36 | call to method SetParamSingle | Assignments.cs:42:28:42:35 | access to field IntField |  |
+| Assignments.cs:42:9:42:36 | call to method SetParamSingle | Assignments.cs:43:9:43:56 | ...; |  |
 | Assignments.cs:42:9:42:36 | this access | Assignments.cs:42:28:42:35 | this access |  |
 | Assignments.cs:42:9:42:37 | ...; | Assignments.cs:42:9:42:36 | this access |  |
-| Assignments.cs:42:28:42:35 | access to field IntField | Assignments.cs:43:9:43:56 | ...; |  |
-| Assignments.cs:42:28:42:35 | this access | Assignments.cs:42:9:42:36 | call to method SetParamSingle |  |
-| Assignments.cs:43:9:43:55 | call to method SetParamMulti | Assignments.cs:43:44:43:54 | access to field StringField |  |
+| Assignments.cs:42:28:42:35 | access to field IntField | Assignments.cs:42:9:42:36 | call to method SetParamSingle |  |
+| Assignments.cs:42:28:42:35 | this access | Assignments.cs:42:28:42:35 | access to field IntField |  |
+| Assignments.cs:43:9:43:55 | call to method SetParamMulti | Assignments.cs:44:9:44:59 | ...; |  |
 | Assignments.cs:43:9:43:55 | this access | Assignments.cs:43:34:43:37 | null |  |
 | Assignments.cs:43:9:43:56 | ...; | Assignments.cs:43:9:43:55 | this access |  |
 | Assignments.cs:43:34:43:37 | null | Assignments.cs:43:44:43:54 | this access |  |
-| Assignments.cs:43:44:43:54 | access to field StringField | Assignments.cs:44:9:44:59 | ...; |  |
-| Assignments.cs:43:44:43:54 | this access | Assignments.cs:43:9:43:55 | call to method SetParamMulti |  |
-| Assignments.cs:44:9:44:58 | call to method SetParamMulti | Assignments.cs:44:27:44:34 | access to field IntField |  |
+| Assignments.cs:43:44:43:54 | access to field StringField | Assignments.cs:43:9:43:55 | call to method SetParamMulti |  |
+| Assignments.cs:43:44:43:54 | this access | Assignments.cs:43:44:43:54 | access to field StringField |  |
+| Assignments.cs:44:9:44:58 | call to method SetParamMulti | Assignments.cs:38:10:38:11 | exit M2 (normal) |  |
 | Assignments.cs:44:9:44:58 | this access | Assignments.cs:44:27:44:34 | this access |  |
 | Assignments.cs:44:9:44:59 | ...; | Assignments.cs:44:9:44:58 | this access |  |
-| Assignments.cs:44:27:44:34 | access to field IntField | Assignments.cs:44:47:44:57 | access to field StringField |  |
-| Assignments.cs:44:27:44:34 | this access | Assignments.cs:44:37:44:40 | null |  |
+| Assignments.cs:44:27:44:34 | access to field IntField | Assignments.cs:44:37:44:40 | null |  |
+| Assignments.cs:44:27:44:34 | this access | Assignments.cs:44:27:44:34 | access to field IntField |  |
 | Assignments.cs:44:37:44:40 | null | Assignments.cs:44:47:44:57 | this access |  |
-| Assignments.cs:44:47:44:57 | access to field StringField | Assignments.cs:38:10:38:11 | exit M2 (normal) |  |
-| Assignments.cs:44:47:44:57 | this access | Assignments.cs:44:9:44:58 | call to method SetParamMulti |  |
+| Assignments.cs:44:47:44:57 | access to field StringField | Assignments.cs:44:9:44:58 | call to method SetParamMulti |  |
+| Assignments.cs:44:47:44:57 | this access | Assignments.cs:44:47:44:57 | access to field StringField |  |
 | BreakInTry.cs:1:7:1:16 | call to constructor Object | BreakInTry.cs:1:7:1:16 | {...} |  |
 | BreakInTry.cs:1:7:1:16 | call to method <object initializer> | BreakInTry.cs:1:7:1:16 | call to constructor Object |  |
 | BreakInTry.cs:1:7:1:16 | enter BreakInTry | BreakInTry.cs:1:7:1:16 | this access |  |