diff --git a/csharp/ql/test/library-tests/partial/MethodIsPartial.expected b/csharp/ql/test/library-tests/partial/MethodIsPartial.expected
index 4c0e905d8c5..a0f1f88fb98 100644
--- a/csharp/ql/test/library-tests/partial/MethodIsPartial.expected
+++ b/csharp/ql/test/library-tests/partial/MethodIsPartial.expected
@@ -1,7 +1,7 @@
-| Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 | true |
-| Partial.cs:5:17:5:23 | Method2 | false |
-| Partial.cs:14:18:14:39 | PartialMethodWithBody1 | true |
-| Partial.cs:15:17:15:23 | Method3 | false |
-| Partial.cs:34:18:34:42 | PartialMethodWithoutBody2 | true |
-| Partial.cs:35:17:35:23 | Method4 | false |
-| Partial.cs:40:17:40:23 | Method5 | false |
+| Partial.cs:6:18:6:42 | PartialMethodWithoutBody1 | true |
+| Partial.cs:7:17:7:23 | Method2 | false |
+| Partial.cs:18:18:18:39 | PartialMethodWithBody1 | true |
+| Partial.cs:19:17:19:23 | Method3 | false |
+| Partial.cs:41:18:41:42 | PartialMethodWithoutBody2 | true |
+| Partial.cs:42:17:42:23 | Method4 | false |
+| Partial.cs:47:17:47:23 | Method5 | false |
diff --git a/csharp/ql/test/library-tests/partial/Partial.cs b/csharp/ql/test/library-tests/partial/Partial.cs
index 5a3e4af2e8c..8dd757fcd24 100644
--- a/csharp/ql/test/library-tests/partial/Partial.cs
+++ b/csharp/ql/test/library-tests/partial/Partial.cs
@@ -1,3 +1,5 @@
+using System;
+
 partial class TwoPartClass
 {
     partial void PartialMethodWithBody1();
@@ -7,6 +9,8 @@ partial class TwoPartClass
     public partial object PartialProperty1 { get; set; }
     // Declaring declaration.
     public partial object this[int index] { get; set; }
+    // Declaring declaration.
+    public partial event EventHandler PartialEvent1;
 }
 
 partial class TwoPartClass
@@ -27,6 +31,9 @@ partial class TwoPartClass
         get { return _backingArray[index]; }
         set { _backingArray[index] = value; }
     }
+
+    // Implementation declaration.
+    public partial event EventHandler PartialEvent1 { add { } remove { } }
 }
 
 partial class OnePartPartialClass
@@ -44,4 +51,5 @@ class NonPartialClass
         get { return null; }
         set { }
     }
+    public event EventHandler Event;
 }
diff --git a/csharp/ql/test/library-tests/partial/Partial1.expected b/csharp/ql/test/library-tests/partial/Partial1.expected
index 55dcaabcea7..3fd8b9e2fd4 100644
--- a/csharp/ql/test/library-tests/partial/Partial1.expected
+++ b/csharp/ql/test/library-tests/partial/Partial1.expected
@@ -1,14 +1,14 @@
-| Partial.cs:1:15:1:26 | TwoPartClass |
-| Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 |
-| Partial.cs:12:15:12:26 | TwoPartClass |
-| Partial.cs:14:18:14:39 | PartialMethodWithBody1 |
-| Partial.cs:18:27:18:42 | PartialProperty1 |
-| Partial.cs:20:9:20:11 | get_PartialProperty1 |
-| Partial.cs:21:9:21:11 | set_PartialProperty1 |
-| Partial.cs:25:27:25:30 | Item |
-| Partial.cs:27:9:27:11 | get_Item |
-| Partial.cs:28:9:28:11 | set_Item |
-| Partial.cs:32:15:32:33 | OnePartPartialClass |
-| Partial.cs:34:18:34:42 | PartialMethodWithoutBody2 |
+| Partial.cs:3:15:3:26 | TwoPartClass |
+| Partial.cs:6:18:6:42 | PartialMethodWithoutBody1 |
+| Partial.cs:16:15:16:26 | TwoPartClass |
+| Partial.cs:18:18:18:39 | PartialMethodWithBody1 |
+| Partial.cs:22:27:22:42 | PartialProperty1 |
+| Partial.cs:24:9:24:11 | get_PartialProperty1 |
+| Partial.cs:25:9:25:11 | set_PartialProperty1 |
+| Partial.cs:29:27:29:30 | Item |
+| Partial.cs:31:9:31:11 | get_Item |
+| Partial.cs:32:9:32:11 | set_Item |
+| Partial.cs:39:15:39:33 | OnePartPartialClass |
+| Partial.cs:41:18:41:42 | PartialMethodWithoutBody2 |
 | PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles |
 | PartialMultipleFiles2.cs:1:22:1:41 | PartialMultipleFiles |
diff --git a/csharp/ql/test/library-tests/partial/Partial2.expected b/csharp/ql/test/library-tests/partial/Partial2.expected
index 87194dd3f9e..8d608c26011 100644
--- a/csharp/ql/test/library-tests/partial/Partial2.expected
+++ b/csharp/ql/test/library-tests/partial/Partial2.expected
@@ -1,15 +1,15 @@
-| Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:1:15:1:26 | <object initializer> |
-| Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 |
-| Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:5:17:5:23 | Method2 |
-| Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:14:18:14:39 | PartialMethodWithBody1 |
-| Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:15:17:15:23 | Method3 |
-| Partial.cs:12:15:12:26 | TwoPartClass | Partial.cs:1:15:1:26 | <object initializer> |
-| Partial.cs:12:15:12:26 | TwoPartClass | Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 |
-| Partial.cs:12:15:12:26 | TwoPartClass | Partial.cs:5:17:5:23 | Method2 |
-| Partial.cs:12:15:12:26 | TwoPartClass | Partial.cs:14:18:14:39 | PartialMethodWithBody1 |
-| Partial.cs:12:15:12:26 | TwoPartClass | Partial.cs:15:17:15:23 | Method3 |
-| Partial.cs:32:15:32:33 | OnePartPartialClass | Partial.cs:32:15:32:33 | <object initializer> |
-| Partial.cs:32:15:32:33 | OnePartPartialClass | Partial.cs:34:18:34:42 | PartialMethodWithoutBody2 |
-| Partial.cs:32:15:32:33 | OnePartPartialClass | Partial.cs:35:17:35:23 | Method4 |
+| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:3:15:3:26 | <object initializer> |
+| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:6:18:6:42 | PartialMethodWithoutBody1 |
+| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:7:17:7:23 | Method2 |
+| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:18:18:18:39 | PartialMethodWithBody1 |
+| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:19:17:19:23 | Method3 |
+| Partial.cs:16:15:16:26 | TwoPartClass | Partial.cs:3:15:3:26 | <object initializer> |
+| Partial.cs:16:15:16:26 | TwoPartClass | Partial.cs:6:18:6:42 | PartialMethodWithoutBody1 |
+| Partial.cs:16:15:16:26 | TwoPartClass | Partial.cs:7:17:7:23 | Method2 |
+| Partial.cs:16:15:16:26 | TwoPartClass | Partial.cs:18:18:18:39 | PartialMethodWithBody1 |
+| Partial.cs:16:15:16:26 | TwoPartClass | Partial.cs:19:17:19:23 | Method3 |
+| Partial.cs:39:15:39:33 | OnePartPartialClass | Partial.cs:39:15:39:33 | <object initializer> |
+| Partial.cs:39:15:39:33 | OnePartPartialClass | Partial.cs:41:18:41:42 | PartialMethodWithoutBody2 |
+| Partial.cs:39:15:39:33 | OnePartPartialClass | Partial.cs:42:17:42:23 | Method4 |
 | PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles | PartialMultipleFiles1.cs:1:22:1:41 | <object initializer> |
 | PartialMultipleFiles2.cs:1:22:1:41 | PartialMultipleFiles | PartialMultipleFiles1.cs:1:22:1:41 | <object initializer> |
diff --git a/csharp/ql/test/library-tests/partial/PartialAccessors.expected b/csharp/ql/test/library-tests/partial/PartialAccessors.expected
index 2c69ed620ae..e9180ffce56 100644
--- a/csharp/ql/test/library-tests/partial/PartialAccessors.expected
+++ b/csharp/ql/test/library-tests/partial/PartialAccessors.expected
@@ -1,8 +1,12 @@
-| Partial.cs:20:9:20:11 | get_PartialProperty1 | true |
-| Partial.cs:21:9:21:11 | set_PartialProperty1 | true |
-| Partial.cs:27:9:27:11 | get_Item | true |
-| Partial.cs:28:9:28:11 | set_Item | true |
-| Partial.cs:41:30:41:32 | get_Property | false |
-| Partial.cs:41:35:41:37 | set_Property | false |
-| Partial.cs:44:9:44:11 | get_Item | false |
-| Partial.cs:45:9:45:11 | set_Item | false |
+| Partial.cs:13:39:13:51 | add_PartialEvent1 | false |
+| Partial.cs:13:39:13:51 | remove_PartialEvent1 | false |
+| Partial.cs:24:9:24:11 | get_PartialProperty1 | true |
+| Partial.cs:25:9:25:11 | set_PartialProperty1 | true |
+| Partial.cs:31:9:31:11 | get_Item | true |
+| Partial.cs:32:9:32:11 | set_Item | true |
+| Partial.cs:48:30:48:32 | get_Property | false |
+| Partial.cs:48:35:48:37 | set_Property | false |
+| Partial.cs:51:9:51:11 | get_Item | false |
+| Partial.cs:52:9:52:11 | set_Item | false |
+| Partial.cs:54:31:54:35 | add_Event | false |
+| Partial.cs:54:31:54:35 | remove_Event | false |
diff --git a/csharp/ql/test/library-tests/partial/PartialConstructors.expected b/csharp/ql/test/library-tests/partial/PartialConstructors.expected
index 01779f1b81e..69cabb244f5 100644
--- a/csharp/ql/test/library-tests/partial/PartialConstructors.expected
+++ b/csharp/ql/test/library-tests/partial/PartialConstructors.expected
@@ -1,4 +1,4 @@
-| Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:1:15:1:26 | {...} |
-| Partial.cs:32:15:32:33 | OnePartPartialClass | Partial.cs:32:15:32:33 | {...} |
-| Partial.cs:38:7:38:21 | NonPartialClass | Partial.cs:38:7:38:21 | {...} |
+| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:3:15:3:26 | {...} |
+| Partial.cs:39:15:39:33 | OnePartPartialClass | Partial.cs:39:15:39:33 | {...} |
+| Partial.cs:45:7:45:21 | NonPartialClass | Partial.cs:45:7:45:21 | {...} |
 | PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles | PartialMultipleFiles1.cs:1:22:1:41 | {...} |
diff --git a/csharp/ql/test/library-tests/partial/PartialEvents.expected b/csharp/ql/test/library-tests/partial/PartialEvents.expected
new file mode 100644
index 00000000000..e3ee325248a
--- /dev/null
+++ b/csharp/ql/test/library-tests/partial/PartialEvents.expected
@@ -0,0 +1,2 @@
+| Partial.cs:13:39:13:51 | PartialEvent1 | false |
+| Partial.cs:54:31:54:35 | Event | false |
diff --git a/csharp/ql/test/library-tests/partial/PartialEvents.ql b/csharp/ql/test/library-tests/partial/PartialEvents.ql
new file mode 100644
index 00000000000..e9f45250266
--- /dev/null
+++ b/csharp/ql/test/library-tests/partial/PartialEvents.ql
@@ -0,0 +1,7 @@
+import csharp
+
+private boolean isPartial(Event e) { if e.isPartial() then result = true else result = false }
+
+from Event e
+where e.fromSource()
+select e, isPartial(e)
diff --git a/csharp/ql/test/library-tests/partial/PartialIndexers.expected b/csharp/ql/test/library-tests/partial/PartialIndexers.expected
index 151ed5aad03..be625fc4ad5 100644
--- a/csharp/ql/test/library-tests/partial/PartialIndexers.expected
+++ b/csharp/ql/test/library-tests/partial/PartialIndexers.expected
@@ -1,2 +1,2 @@
-| Partial.cs:25:27:25:30 | Item | true |
-| Partial.cs:42:19:42:22 | Item | false |
+| Partial.cs:29:27:29:30 | Item | true |
+| Partial.cs:49:19:49:22 | Item | false |
diff --git a/csharp/ql/test/library-tests/partial/PartialMethodBody.expected b/csharp/ql/test/library-tests/partial/PartialMethodBody.expected
index b75a105bea0..a91a156cb62 100644
--- a/csharp/ql/test/library-tests/partial/PartialMethodBody.expected
+++ b/csharp/ql/test/library-tests/partial/PartialMethodBody.expected
@@ -1,3 +1,3 @@
-| Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 | false |
-| Partial.cs:14:18:14:39 | PartialMethodWithBody1 | true |
-| Partial.cs:34:18:34:42 | PartialMethodWithoutBody2 | false |
+| Partial.cs:6:18:6:42 | PartialMethodWithoutBody1 | false |
+| Partial.cs:18:18:18:39 | PartialMethodWithBody1 | true |
+| Partial.cs:41:18:41:42 | PartialMethodWithoutBody2 | false |
diff --git a/csharp/ql/test/library-tests/partial/PartialProperties.expected b/csharp/ql/test/library-tests/partial/PartialProperties.expected
index 8d2dfc01e74..4686bbf087a 100644
--- a/csharp/ql/test/library-tests/partial/PartialProperties.expected
+++ b/csharp/ql/test/library-tests/partial/PartialProperties.expected
@@ -1,2 +1,2 @@
-| Partial.cs:18:27:18:42 | PartialProperty1 | true |
-| Partial.cs:41:19:41:26 | Property | false |
+| Partial.cs:22:27:22:42 | PartialProperty1 | true |
+| Partial.cs:48:19:48:26 | Property | false |
diff --git a/csharp/ql/test/library-tests/partial/PrintAst.expected b/csharp/ql/test/library-tests/partial/PrintAst.expected
index 0729946b18b..90471e0a80c 100644
--- a/csharp/ql/test/library-tests/partial/PrintAst.expected
+++ b/csharp/ql/test/library-tests/partial/PrintAst.expected
@@ -1,94 +1,110 @@
 Partial.cs:
-#    1| [Class] TwoPartClass
-#    4|   6: [Method] PartialMethodWithoutBody1
-#    4|     -1: [TypeMention] Void
-#    5|   7: [Method] Method2
+#    3| [Class] TwoPartClass
+#    6|   6: [Method] PartialMethodWithoutBody1
+#    6|     -1: [TypeMention] Void
+#    7|   7: [Method] Method2
+#    7|     -1: [TypeMention] Void
+#    7|     4: [BlockStmt] {...}
+#   13|   8: [Event] PartialEvent1
+#   13|     -1: [TypeMention] EventHandler
+#   13|     3: [AddEventAccessor] add_PartialEvent1
+#-----|       2: (Parameters)
+#   13|         0: [Parameter] value
+#   13|     4: [RemoveEventAccessor] remove_PartialEvent1
+#-----|       2: (Parameters)
+#   13|         0: [Parameter] value
+#   18|   9: [Method] PartialMethodWithBody1
 #    5|     -1: [TypeMention] Void
-#    5|     4: [BlockStmt] {...}
-#   14|   8: [Method] PartialMethodWithBody1
-#    3|     -1: [TypeMention] Void
-#   14|     4: [BlockStmt] {...}
-#   15|   9: [Method] Method3
-#   15|     -1: [TypeMention] Void
-#   15|     4: [BlockStmt] {...}
-#   16|   10: [Field] _backingField
-#   16|     -1: [TypeMention] object
-#   18|   11: [Property] PartialProperty1
-#    7|     -1: [TypeMention] object
-#   18|     -1: [TypeMention] object
-#   20|     3: [Getter] get_PartialProperty1
-#   20|       4: [BlockStmt] {...}
-#   20|         0: [ReturnStmt] return ...;
-#   20|           0: [FieldAccess] access to field _backingField
-#   21|     4: [Setter] set_PartialProperty1
-#-----|       2: (Parameters)
-#   21|         0: [Parameter] value
-#   21|       4: [BlockStmt] {...}
-#   21|         0: [ExprStmt] ...;
-#   21|           0: [AssignExpr] ... = ...
-#   21|             0: [FieldAccess] access to field _backingField
-#   21|             1: [ParameterAccess] access to parameter value
-#   23|   12: [Field] _backingArray
-#   23|     -1: [TypeMention] Object[]
-#   23|       1: [TypeMention] object
-#   25|   13: [Indexer] Item
+#   18|     4: [BlockStmt] {...}
+#   19|   10: [Method] Method3
+#   19|     -1: [TypeMention] Void
+#   19|     4: [BlockStmt] {...}
+#   20|   11: [Field] _backingField
+#   20|     -1: [TypeMention] object
+#   22|   12: [Property] PartialProperty1
 #    9|     -1: [TypeMention] object
-#   25|     -1: [TypeMention] object
+#   22|     -1: [TypeMention] object
+#   24|     3: [Getter] get_PartialProperty1
+#   24|       4: [BlockStmt] {...}
+#   24|         0: [ReturnStmt] return ...;
+#   24|           0: [FieldAccess] access to field _backingField
+#   25|     4: [Setter] set_PartialProperty1
+#-----|       2: (Parameters)
+#   25|         0: [Parameter] value
+#   25|       4: [BlockStmt] {...}
+#   25|         0: [ExprStmt] ...;
+#   25|           0: [AssignExpr] ... = ...
+#   25|             0: [FieldAccess] access to field _backingField
+#   25|             1: [ParameterAccess] access to parameter value
+#   27|   13: [Field] _backingArray
+#   27|     -1: [TypeMention] Object[]
+#   27|       1: [TypeMention] object
+#   29|   14: [Indexer] Item
+#   11|     -1: [TypeMention] object
+#   29|     -1: [TypeMention] object
 #-----|     1: (Parameters)
-#    9|       0: [Parameter] index
-#    9|         -1: [TypeMention] int
-#   25|         -1: [TypeMention] int
-#   27|     3: [Getter] get_Item
+#   11|       0: [Parameter] index
+#   11|         -1: [TypeMention] int
+#   29|         -1: [TypeMention] int
+#   31|     3: [Getter] get_Item
 #-----|       2: (Parameters)
-#   25|         0: [Parameter] index
-#   27|       4: [BlockStmt] {...}
-#   27|         0: [ReturnStmt] return ...;
-#   27|           0: [ArrayAccess] access to array element
-#   27|             -1: [FieldAccess] access to field _backingArray
-#   27|             0: [ParameterAccess] access to parameter index
-#   28|     4: [Setter] set_Item
+#   29|         0: [Parameter] index
+#   31|       4: [BlockStmt] {...}
+#   31|         0: [ReturnStmt] return ...;
+#   31|           0: [ArrayAccess] access to array element
+#   31|             -1: [FieldAccess] access to field _backingArray
+#   31|             0: [ParameterAccess] access to parameter index
+#   32|     4: [Setter] set_Item
 #-----|       2: (Parameters)
-#   25|         0: [Parameter] index
-#   28|         1: [Parameter] value
-#   28|       4: [BlockStmt] {...}
-#   28|         0: [ExprStmt] ...;
-#   28|           0: [AssignExpr] ... = ...
-#   28|             0: [ArrayAccess] access to array element
-#   28|               -1: [FieldAccess] access to field _backingArray
-#   28|               0: [ParameterAccess] access to parameter index
-#   28|             1: [ParameterAccess] access to parameter value
-#   32| [Class] OnePartPartialClass
-#   34|   6: [Method] PartialMethodWithoutBody2
-#   34|     -1: [TypeMention] Void
-#   35|   7: [Method] Method4
-#   35|     -1: [TypeMention] Void
-#   35|     4: [BlockStmt] {...}
-#   38| [Class] NonPartialClass
-#   40|   6: [Method] Method5
-#   40|     -1: [TypeMention] Void
-#   40|     4: [BlockStmt] {...}
-#   41|   7: [Property] Property
-#   41|     -1: [TypeMention] object
-#   41|     3: [Getter] get_Property
-#   41|     4: [Setter] set_Property
+#   29|         0: [Parameter] index
+#   32|         1: [Parameter] value
+#   32|       4: [BlockStmt] {...}
+#   32|         0: [ExprStmt] ...;
+#   32|           0: [AssignExpr] ... = ...
+#   32|             0: [ArrayAccess] access to array element
+#   32|               -1: [FieldAccess] access to field _backingArray
+#   32|               0: [ParameterAccess] access to parameter index
+#   32|             1: [ParameterAccess] access to parameter value
+#   39| [Class] OnePartPartialClass
+#   41|   6: [Method] PartialMethodWithoutBody2
+#   41|     -1: [TypeMention] Void
+#   42|   7: [Method] Method4
+#   42|     -1: [TypeMention] Void
+#   42|     4: [BlockStmt] {...}
+#   45| [Class] NonPartialClass
+#   47|   6: [Method] Method5
+#   47|     -1: [TypeMention] Void
+#   47|     4: [BlockStmt] {...}
+#   48|   7: [Property] Property
+#   48|     -1: [TypeMention] object
+#   48|     3: [Getter] get_Property
+#   48|     4: [Setter] set_Property
 #-----|       2: (Parameters)
-#   41|         0: [Parameter] value
-#   42|   8: [Indexer] Item
-#   42|     -1: [TypeMention] object
+#   48|         0: [Parameter] value
+#   49|   8: [Indexer] Item
+#   49|     -1: [TypeMention] object
 #-----|     1: (Parameters)
-#   42|       0: [Parameter] index
-#   42|         -1: [TypeMention] int
-#   44|     3: [Getter] get_Item
+#   49|       0: [Parameter] index
+#   49|         -1: [TypeMention] int
+#   51|     3: [Getter] get_Item
 #-----|       2: (Parameters)
-#   42|         0: [Parameter] index
-#   44|       4: [BlockStmt] {...}
-#   44|         0: [ReturnStmt] return ...;
-#   44|           0: [NullLiteral] null
-#   45|     4: [Setter] set_Item
+#   49|         0: [Parameter] index
+#   51|       4: [BlockStmt] {...}
+#   51|         0: [ReturnStmt] return ...;
+#   51|           0: [NullLiteral] null
+#   52|     4: [Setter] set_Item
 #-----|       2: (Parameters)
-#   42|         0: [Parameter] index
-#   45|         1: [Parameter] value
-#   45|       4: [BlockStmt] {...}
+#   49|         0: [Parameter] index
+#   52|         1: [Parameter] value
+#   52|       4: [BlockStmt] {...}
+#   54|   9: [Event] Event
+#   54|     -1: [TypeMention] EventHandler
+#   54|     3: [AddEventAccessor] add_Event
+#-----|       2: (Parameters)
+#   54|         0: [Parameter] value
+#   54|     4: [RemoveEventAccessor] remove_Event
+#-----|       2: (Parameters)
+#   54|         0: [Parameter] value
 PartialMultipleFiles1.cs:
 #    1| [Class] PartialMultipleFiles
 PartialMultipleFiles2.cs: