diff --git a/TS.fsx b/TS.fsx
index 755dc8be1..0712c3d99 100644
--- a/TS.fsx
+++ b/TS.fsx
@@ -670,6 +670,10 @@ module Data =
     let extendConflictsBaseTypes =
         extendConflicts |> List.map (fun ec -> (ec.BaseType, ec)) |> Map.ofList
 
+    // these types are only mixins to define shared events, they don't extend the EventTarget interface, therefore no need to
+    // emit "addEventListener" for them
+    let nonEventTargetTypes = ["GlobalEventHandlers"; "AbstractWorker"; "XMLHttpRequestEventTarget"; "MSBaseReader"]
+
 module Emit =
     open Data
     open Types
@@ -698,7 +702,7 @@ module Emit =
         | "DOMString" -> "string"
         | "DOMTimeStamp" -> "number"
         | "EndOfStreamError" -> "number"
-        | "EventListener" -> "EventListenerOrEventListenerObject"
+        | "EventListener" -> "EventListenerOrEventListenerObject<this>"
         | "double" | "float" -> "number"
         | "Function" -> "Function"
         | "long" | "long long" | "signed long" | "signed long long" | "unsigned long" | "unsigned long long" -> "number"
@@ -854,8 +858,17 @@ module Emit =
         String.Join(", ", (List.map paramToString ps))
 
     let EmitCallBackInterface (i:Browser.Interface) =
-        Pt.Printl "interface %s {" i.Name
-        Pt.PrintWithAddedIndent "(evt: Event): void;"
+        if i.Name = "EventListener" then
+            Pt.Printl "interface %s<T extends EventTarget<T>> {" i.Name
+            Pt.PrintWithAddedIndent "(evt: Event<T>): void;"
+        else
+            Pt.Printl "interface %s {" i.Name
+            let handleEventMethod = i.Methods.Value.Methods |> Array.find (fun m -> m.Name.Value = "handleEvent")
+            let paramList =
+                [for p in handleEventMethod.Params do
+                    yield {Type = p.Type; Name = p.Name; Optional = p.Optional.IsSome; Variadic = p.Variadic.IsSome; Nullable = p.Nullable.IsSome}]
+            Pt.PrintWithAddedIndent "(%s): void;" (ParamsToString paramList)
+        
         Pt.Printl "}"
         Pt.Printl ""
 
@@ -892,6 +905,11 @@ module Emit =
              | Some pollutor -> "this: " + pollutor.Name + ", "
              | _ -> ""
 
+    let ComputeEventTypeParameter containingInterfaceName flavor (prefix: string) =
+        if prefix.StartsWith("declare ") then "<" + GetGlobalPollutorName flavor + ">"
+        elif List.contains containingInterfaceName nonEventTargetTypes then "<T>" 
+        else "<" + containingInterfaceName + ">"
+
     let EmitProperties flavor prefix (emitScope: EmitScope) (i: Browser.Interface) (conflictedMembers: Set<string>) =
         let emitPropertyFromJson (p: InputJsonType.Root) =
             let readOnlyModifier =
@@ -928,7 +946,11 @@ module Emit =
                                     getEventTypeInInterface p.EventHandler.Value i
                                 else
                                     "Event"
-                            String.Format("({0}ev: {1}) => any", EmitEventHandlerThis flavor prefix i, eType)
+                            String.Format(
+                                "({0}ev: {1}{2}) => any",
+                                EmitEventHandlerThis flavor prefix i,
+                                eType,
+                                ComputeEventTypeParameter i.Name flavor prefix)
                         | _ -> DomTypeToTsType p.Type
                     let pTypeAndNull = if p.Nullable.IsSome then makeNullable pType else pType
                     let readOnlyModifier = if p.ReadOnly.IsSome && prefix = "" then "readonly " else ""
@@ -968,7 +990,7 @@ module Emit =
             matchScope emitScope m &&
             not (prefix <> "" && OptionCheckValue "addEventListener" m.Name)
 
-        let emitMethod flavor prefix (i:Browser.Interface) (m:Browser.Method) =
+        let emitMethod flavor (prefix: string) (i:Browser.Interface) (m:Browser.Method) =
             let printLine content =
                 if m.Name.IsSome && conflictedMembers.Contains m.Name.Value then Pt.PrintlToStack content else Pt.Printl content
             // print comment
@@ -982,6 +1004,13 @@ module Emit =
             let removedType = Option.bind (fun name -> InputJson.getRemovedItemByName name InputJson.ItemKind.Method i.Name) m.Name
             let overridenType = Option.bind (fun mName -> InputJson.getOverriddenItemByName mName InputJson.ItemKind.Method i.Name) m.Name
 
+            let replaceThisWithGlobalPollutor (signature: string) =
+                if prefix.StartsWith "declare " then
+                    let regex = Regex(@"\bthis\b")
+                    regex.Replace(signature, GetGlobalPollutorName flavor)
+                else
+                    signature
+
             if removedType.IsNone then
                 match overridenType with
                 | Some t ->
@@ -1005,7 +1034,7 @@ module Emit =
 
                         let overloads = GetOverloads (Function.Method m) false
                         for { ParamCombinations = pCombList; ReturnTypes = rTypes; Nullable = isNullable } in overloads do
-                            let paramsString = ParamsToString pCombList
+                            let paramsString = ParamsToString pCombList |> replaceThisWithGlobalPollutor
                             let returnString =
                                 let returnType = rTypes |> List.map DomTypeToTsType |> String.concat " | "
                                 if isNullable then makeNullable returnType else returnType
@@ -1058,7 +1087,9 @@ module Emit =
                 prefix iParent.Name i.Name iParent.Name
 
         let shouldEmitStringEventHandler =
-            if iNameToEhList.ContainsKey i.Name  && not iNameToEhList.[i.Name].IsEmpty then
+            if List.contains i.Name nonEventTargetTypes then
+                false
+            elif iNameToEhList.ContainsKey i.Name  && not iNameToEhList.[i.Name].IsEmpty then
                 emitEventHandler fPrefix i
                 true
             elif iNameToEhParents.ContainsKey i.Name && not iNameToEhParents.[i.Name].IsEmpty then
@@ -1071,8 +1102,9 @@ module Emit =
 
         if shouldEmitStringEventHandler then
             Pt.Printl
-                "%saddEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;"
+                "%saddEventListener(type: string, listener: EventListenerOrEventListenerObject%s, useCapture?: boolean): void;"
                 fPrefix
+                (ComputeEventTypeParameter i.Name flavor prefix)
 
     let EmitConstructorSignature (i:Browser.Interface) =
         let emitConstructorSigFromJson (c: InputJsonType.Root) =
@@ -1123,16 +1155,18 @@ module Emit =
                 Pt.Printl "declare var %s: {new(%s): %s; };" nc.Name (ParamsToString ncParams) i.Name)
 
     let EmitInterfaceDeclaration (i:Browser.Interface) =
-        let processIName iName =
+        let generateBaseTypeNameIfNecessary iName =
             match Map.tryFind iName extendConflictsBaseTypes with
             | Some _ -> iName + "Base"
             | _ -> iName
 
-        let processedIName = processIName i.Name
-        if processedIName <> i.Name then
-            Pt.PrintlToStack "interface %s extends %s {" i.Name processedIName
+        let baseTypeName = generateBaseTypeNameIfNecessary i.Name
+        if baseTypeName <> i.Name then
+            Pt.PrintlToStack "interface %s extends %s {" i.Name baseTypeName
+            Pt.Printl "interface %s" baseTypeName
+        else
+            Pt.Printl "interface %s" i.Name
 
-        Pt.Printl "interface %s" processedIName
         let finalExtends =
             let overridenExtendsFromJson =
                 InputJson.getOverriddenItemsByInterfaceName ItemKind.Extends Flavor.All i.Name
@@ -1151,11 +1185,31 @@ module Emit =
                 else
                     overridenExtendsFromJson
 
-            combinedExtends |> List.map processIName
-
-        match finalExtends  with
-        | [] -> ()
-        | allExtends -> Pt.Print " extends %s" (String.Join(", ", allExtends))
+            combinedExtends |> List.map generateBaseTypeNameIfNecessary
+
+        let mutable typeParameter = ""
+        let mutable extendsToPrint = finalExtends
+        if List.contains i.Name nonEventTargetTypes || i.Name = "Event" then
+            typeParameter <- "<T extends EventTarget<T> = EventTarget>"
+
+        if not (List.isEmpty finalExtends) then
+            // Cases:
+            // 1. Direct inheritance of "Event"
+            //     interface XYZEvent<T> extends EventTarget = EventTarget> extends Event<T>
+            // 2. Indirect inheritance of "Event"
+            //     interface XYZEvent<T> extends EventTarget = EventTarget> extends UIEvent<T>
+            if IsDependsOn i.Name "Event" then
+                typeParameter <- "<T extends EventTarget<T> = EventTarget>"
+                extendsToPrint <- extendsToPrint |> List.map (fun baseType -> if baseType = "Event" || IsDependsOn baseType "Event" then baseType + "<T>" else baseType)
+            // If the current interface inherits from one of the non-eventtarget mixin types, the
+            // type argument should be the interface itself, if it also extends EventTarget. E.g.
+            // 
+            //    interface XYZEventTarget extends EventTarget, GlobalEventHandlers<XYZEventTarget>
+            if IsDependsOn i.Name "EventTarget" then
+                extendsToPrint <- extendsToPrint |> List.map (fun extends -> if List.contains extends nonEventTargetTypes then extends + "<" + i.Name + ">" else extends)
+        Pt.Print "%s" typeParameter
+        if not (List.isEmpty extendsToPrint) then
+            Pt.Print " extends %s" (String.Join(", ", extendsToPrint))
         Pt.Print " {"
 
     /// To decide if a given method is an indexer and should be emited
@@ -1244,28 +1298,31 @@ module Emit =
             Pt.Printl ""
 
     let EmitInterface flavor (i:Browser.Interface) =
-        Pt.ClearStack()
-        EmitInterfaceEventMap flavor i
-
-        Pt.ResetIndent()
-        EmitInterfaceDeclaration i
-        Pt.IncreaseIndent()
+        match getRemovedItemByName i.Name ItemKind.Interface i.Name with
+        | Some _ -> ()
+        | _ ->
+            Pt.ClearStack()
+            EmitInterfaceEventMap flavor i
 
-        let prefix = ""
-        EmitMembers flavor prefix EmitScope.InstanceOnly i
-        EmitConstants i
-        EmitEventHandlers flavor prefix i
-        EmitIndexers EmitScope.InstanceOnly i
+            Pt.ResetIndent()
+            EmitInterfaceDeclaration i
+            Pt.IncreaseIndent()
 
-        Pt.DecreaseIndent()
-        Pt.Printl "}"
-        Pt.Printl ""
+            let prefix = ""
+            EmitMembers flavor prefix EmitScope.InstanceOnly i
+            EmitConstants i
+            EmitEventHandlers flavor prefix i
+            EmitIndexers EmitScope.InstanceOnly i
 
-        if not (Pt.StackIsEmpty()) then
-            Pt.PrintStackContent()
+            Pt.DecreaseIndent()
             Pt.Printl "}"
             Pt.Printl ""
 
+            if not (Pt.StackIsEmpty()) then
+                Pt.PrintStackContent()
+                Pt.Printl "}"
+                Pt.Printl ""
+
     let EmitStaticInterface flavor (i:Browser.Interface) =
         // Some types are static types with non-static members. For example,
         // NodeFilter is a static method itself, however it has an "acceptNode" method
@@ -1466,7 +1523,7 @@ module Emit =
         // Add missed interface definition from the spec
         InputJson.getAddedItems InputJson.Interface flavor |> Array.iter EmitAddedInterface
 
-        Pt.Printl "declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;"
+        Pt.Printl "declare type EventListenerOrEventListenerObject<T extends EventTarget<T>> = EventListener<T> | EventListenerObject<T>;"
         Pt.Printl ""
 
         EmitCallBackFunctions flavor
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
index 49c153f41..0d7611b9b 100644
--- a/baselines/dom.generated.d.ts
+++ b/baselines/dom.generated.d.ts
@@ -1167,20 +1167,20 @@ interface WheelEventInit extends MouseEventInit {
     deltaMode?: number;
 }
 
-interface EventListener {
-    (evt: Event): void;
+interface EventListener<T extends EventTarget<T>> {
+    (evt: Event<T>): void;
 }
 
 interface WebKitEntriesCallback {
-    (evt: Event): void;
+    (entries: WebKitEntry[]): void;
 }
 
 interface WebKitErrorCallback {
-    (evt: Event): void;
+    (err: DOMError): void;
 }
 
 interface WebKitFileCallback {
-    (evt: Event): void;
+    (file: File): void;
 }
 
 interface ANGLE_instanced_arrays {
@@ -1213,7 +1213,7 @@ declare var AnalyserNode: {
     new(): AnalyserNode;
 }
 
-interface AnimationEvent extends Event {
+interface AnimationEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly animationName: string;
     readonly elapsedTime: number;
     initAnimationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, animationNameArg: string, elapsedTimeArg: number): void;
@@ -1236,14 +1236,14 @@ interface ApplicationCacheEventMap {
 }
 
 interface ApplicationCache extends EventTarget {
-    oncached: (this: ApplicationCache, ev: Event) => any;
-    onchecking: (this: ApplicationCache, ev: Event) => any;
-    ondownloading: (this: ApplicationCache, ev: Event) => any;
-    onerror: (this: ApplicationCache, ev: Event) => any;
-    onnoupdate: (this: ApplicationCache, ev: Event) => any;
-    onobsolete: (this: ApplicationCache, ev: Event) => any;
-    onprogress: (this: ApplicationCache, ev: ProgressEvent) => any;
-    onupdateready: (this: ApplicationCache, ev: Event) => any;
+    oncached: (this: ApplicationCache, ev: Event<ApplicationCache>) => any;
+    onchecking: (this: ApplicationCache, ev: Event<ApplicationCache>) => any;
+    ondownloading: (this: ApplicationCache, ev: Event<ApplicationCache>) => any;
+    onerror: (this: ApplicationCache, ev: Event<ApplicationCache>) => any;
+    onnoupdate: (this: ApplicationCache, ev: Event<ApplicationCache>) => any;
+    onobsolete: (this: ApplicationCache, ev: Event<ApplicationCache>) => any;
+    onprogress: (this: ApplicationCache, ev: ProgressEvent<ApplicationCache>) => any;
+    onupdateready: (this: ApplicationCache, ev: Event<ApplicationCache>) => any;
     readonly status: number;
     abort(): void;
     swapCache(): void;
@@ -1255,7 +1255,7 @@ interface ApplicationCache extends EventTarget {
     readonly UNCACHED: number;
     readonly UPDATEREADY: number;
     addEventListener<K extends keyof ApplicationCacheEventMap>(type: K, listener: (this: ApplicationCache, ev: ApplicationCacheEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<ApplicationCache>, useCapture?: boolean): void;
 }
 
 declare var ApplicationCache: {
@@ -1307,12 +1307,12 @@ interface AudioBufferSourceNode extends AudioNode {
     loop: boolean;
     loopEnd: number;
     loopStart: number;
-    onended: (this: AudioBufferSourceNode, ev: MediaStreamErrorEvent) => any;
+    onended: (this: AudioBufferSourceNode, ev: MediaStreamErrorEvent<AudioBufferSourceNode>) => any;
     readonly playbackRate: AudioParam;
     start(when?: number, offset?: number, duration?: number): void;
     stop(when?: number): void;
     addEventListener<K extends keyof AudioBufferSourceNodeEventMap>(type: K, listener: (this: AudioBufferSourceNode, ev: AudioBufferSourceNodeEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<AudioBufferSourceNode>, useCapture?: boolean): void;
 }
 
 declare var AudioBufferSourceNode: {
@@ -1328,7 +1328,7 @@ interface AudioContextBase extends EventTarget {
     readonly currentTime: number;
     readonly destination: AudioDestinationNode;
     readonly listener: AudioListener;
-    onstatechange: (this: AudioContext, ev: Event) => any;
+    onstatechange: (this: AudioContext, ev: Event<AudioContext>) => any;
     readonly sampleRate: number;
     readonly state: string;
     close(): Promise<void>;
@@ -1354,7 +1354,7 @@ interface AudioContextBase extends EventTarget {
     decodeAudioData(audioData: ArrayBuffer, successCallback?: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): Promise<AudioBuffer>;
     resume(): Promise<void>;
     addEventListener<K extends keyof AudioContextEventMap>(type: K, listener: (this: AudioContext, ev: AudioContextEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<AudioContext>, useCapture?: boolean): void;
 }
 
 interface AudioContext extends AudioContextBase {
@@ -1423,7 +1423,7 @@ declare var AudioParam: {
     new(): AudioParam;
 }
 
-interface AudioProcessingEvent extends Event {
+interface AudioProcessingEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly inputBuffer: AudioBuffer;
     readonly outputBuffer: AudioBuffer;
     readonly playbackTime: number;
@@ -1456,13 +1456,13 @@ interface AudioTrackListEventMap {
 
 interface AudioTrackList extends EventTarget {
     readonly length: number;
-    onaddtrack: (this: AudioTrackList, ev: TrackEvent) => any;
-    onchange: (this: AudioTrackList, ev: Event) => any;
-    onremovetrack: (this: AudioTrackList, ev: TrackEvent) => any;
+    onaddtrack: (this: AudioTrackList, ev: TrackEvent<AudioTrackList>) => any;
+    onchange: (this: AudioTrackList, ev: Event<AudioTrackList>) => any;
+    onremovetrack: (this: AudioTrackList, ev: TrackEvent<AudioTrackList>) => any;
     getTrackById(id: string): AudioTrack | null;
     item(index: number): AudioTrack;
     addEventListener<K extends keyof AudioTrackListEventMap>(type: K, listener: (this: AudioTrackList, ev: AudioTrackListEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<AudioTrackList>, useCapture?: boolean): void;
     [index: number]: AudioTrack;
 }
 
@@ -1480,7 +1480,7 @@ declare var BarProp: {
     new(): BarProp;
 }
 
-interface BeforeUnloadEvent extends Event {
+interface BeforeUnloadEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     returnValue: any;
 }
 
@@ -2236,7 +2236,7 @@ declare var ClientRectList: {
     new(): ClientRectList;
 }
 
-interface ClipboardEvent extends Event {
+interface ClipboardEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly clipboardData: DataTransfer;
 }
 
@@ -2245,7 +2245,7 @@ declare var ClipboardEvent: {
     new(type: string, eventInitDict?: ClipboardEventInit): ClipboardEvent;
 }
 
-interface CloseEvent extends Event {
+interface CloseEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly code: number;
     readonly reason: string;
     readonly wasClean: boolean;
@@ -2266,7 +2266,7 @@ declare var Comment: {
     new(): Comment;
 }
 
-interface CompositionEvent extends UIEvent {
+interface CompositionEvent<T extends EventTarget<T> = EventTarget> extends UIEvent<T> {
     readonly data: string;
     readonly locale: string;
     initCompositionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, locale: string): void;
@@ -2363,7 +2363,7 @@ declare var CryptoKeyPair: {
     new(): CryptoKeyPair;
 }
 
-interface CustomEvent extends Event {
+interface CustomEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly detail: any;
     initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: any): void;
 }
@@ -2519,7 +2519,7 @@ declare var DOMTokenList: {
 interface DataCue extends TextTrackCue {
     data: ArrayBuffer;
     addEventListener<K extends keyof TextTrackCueEventMap>(type: K, listener: (this: DataCue, ev: TextTrackCueEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<DataCue>, useCapture?: boolean): void;
 }
 
 declare var DataCue: {
@@ -2603,7 +2603,7 @@ declare var DeviceAcceleration: {
     new(): DeviceAcceleration;
 }
 
-interface DeviceLightEvent extends Event {
+interface DeviceLightEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly value: number;
 }
 
@@ -2612,7 +2612,7 @@ declare var DeviceLightEvent: {
     new(typeArg: string, eventInitDict?: DeviceLightEventInit): DeviceLightEvent;
 }
 
-interface DeviceMotionEvent extends Event {
+interface DeviceMotionEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly acceleration: DeviceAcceleration | null;
     readonly accelerationIncludingGravity: DeviceAcceleration | null;
     readonly interval: number | null;
@@ -2625,7 +2625,7 @@ declare var DeviceMotionEvent: {
     new(typeArg: string, eventInitDict?: DeviceMotionEventInit): DeviceMotionEvent;
 }
 
-interface DeviceOrientationEvent extends Event {
+interface DeviceOrientationEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly absolute: boolean;
     readonly alpha: number | null;
     readonly beta: number | null;
@@ -2859,294 +2859,294 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Fires when the user aborts the download.
       * @param ev The event.
       */
-    onabort: (this: Document, ev: UIEvent) => any;
+    onabort: (this: Document, ev: UIEvent<Document>) => any;
     /**
       * Fires when the object is set as the active element.
       * @param ev The event.
       */
-    onactivate: (this: Document, ev: UIEvent) => any;
+    onactivate: (this: Document, ev: UIEvent<Document>) => any;
     /**
       * Fires immediately before the object is set as the active element.
       * @param ev The event.
       */
-    onbeforeactivate: (this: Document, ev: UIEvent) => any;
+    onbeforeactivate: (this: Document, ev: UIEvent<Document>) => any;
     /**
       * Fires immediately before the activeElement is changed from the current object to another object in the parent document.
       * @param ev The event.
       */
-    onbeforedeactivate: (this: Document, ev: UIEvent) => any;
+    onbeforedeactivate: (this: Document, ev: UIEvent<Document>) => any;
     /** 
       * Fires when the object loses the input focus. 
       * @param ev The focus event.
       */
-    onblur: (this: Document, ev: FocusEvent) => any;
+    onblur: (this: Document, ev: FocusEvent<Document>) => any;
     /**
       * Occurs when playback is possible, but would require further buffering. 
       * @param ev The event.
       */
-    oncanplay: (this: Document, ev: Event) => any;
-    oncanplaythrough: (this: Document, ev: Event) => any;
+    oncanplay: (this: Document, ev: Event<Document>) => any;
+    oncanplaythrough: (this: Document, ev: Event<Document>) => any;
     /**
       * Fires when the contents of the object or selection have changed. 
       * @param ev The event.
       */
-    onchange: (this: Document, ev: Event) => any;
+    onchange: (this: Document, ev: Event<Document>) => any;
     /**
       * Fires when the user clicks the left mouse button on the object
       * @param ev The mouse event.
       */
-    onclick: (this: Document, ev: MouseEvent) => any;
+    onclick: (this: Document, ev: MouseEvent<Document>) => any;
     /**
       * Fires when the user clicks the right mouse button in the client area, opening the context menu. 
       * @param ev The mouse event.
       */
-    oncontextmenu: (this: Document, ev: PointerEvent) => any;
+    oncontextmenu: (this: Document, ev: PointerEvent<Document>) => any;
     /**
       * Fires when the user double-clicks the object.
       * @param ev The mouse event.
       */
-    ondblclick: (this: Document, ev: MouseEvent) => any;
+    ondblclick: (this: Document, ev: MouseEvent<Document>) => any;
     /**
       * Fires when the activeElement is changed from the current object to another object in the parent document.
       * @param ev The UI Event
       */
-    ondeactivate: (this: Document, ev: UIEvent) => any;
+    ondeactivate: (this: Document, ev: UIEvent<Document>) => any;
     /**
       * Fires on the source object continuously during a drag operation.
       * @param ev The event.
       */
-    ondrag: (this: Document, ev: DragEvent) => any;
+    ondrag: (this: Document, ev: DragEvent<Document>) => any;
     /**
       * Fires on the source object when the user releases the mouse at the close of a drag operation.
       * @param ev The event.
       */
-    ondragend: (this: Document, ev: DragEvent) => any;
+    ondragend: (this: Document, ev: DragEvent<Document>) => any;
     /** 
       * Fires on the target element when the user drags the object to a valid drop target.
       * @param ev The drag event.
       */
-    ondragenter: (this: Document, ev: DragEvent) => any;
+    ondragenter: (this: Document, ev: DragEvent<Document>) => any;
     /** 
       * Fires on the target object when the user moves the mouse out of a valid drop target during a drag operation.
       * @param ev The drag event.
       */
-    ondragleave: (this: Document, ev: DragEvent) => any;
+    ondragleave: (this: Document, ev: DragEvent<Document>) => any;
     /**
       * Fires on the target element continuously while the user drags the object over a valid drop target.
       * @param ev The event.
       */
-    ondragover: (this: Document, ev: DragEvent) => any;
+    ondragover: (this: Document, ev: DragEvent<Document>) => any;
     /**
       * Fires on the source object when the user starts to drag a text selection or selected object. 
       * @param ev The event.
       */
-    ondragstart: (this: Document, ev: DragEvent) => any;
-    ondrop: (this: Document, ev: DragEvent) => any;
+    ondragstart: (this: Document, ev: DragEvent<Document>) => any;
+    ondrop: (this: Document, ev: DragEvent<Document>) => any;
     /**
       * Occurs when the duration attribute is updated. 
       * @param ev The event.
       */
-    ondurationchange: (this: Document, ev: Event) => any;
+    ondurationchange: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs when the media element is reset to its initial state. 
       * @param ev The event.
       */
-    onemptied: (this: Document, ev: Event) => any;
+    onemptied: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs when the end of playback is reached. 
       * @param ev The event
       */
-    onended: (this: Document, ev: MediaStreamErrorEvent) => any;
+    onended: (this: Document, ev: MediaStreamErrorEvent<Document>) => any;
     /**
       * Fires when an error occurs during object loading.
       * @param ev The event.
       */
-    onerror: (this: Document, ev: ErrorEvent) => any;
+    onerror: (this: Document, ev: ErrorEvent<Document>) => any;
     /**
       * Fires when the object receives focus. 
       * @param ev The event.
       */
-    onfocus: (this: Document, ev: FocusEvent) => any;
-    onfullscreenchange: (this: Document, ev: Event) => any;
-    onfullscreenerror: (this: Document, ev: Event) => any;
-    oninput: (this: Document, ev: Event) => any;
-    oninvalid: (this: Document, ev: Event) => any;
+    onfocus: (this: Document, ev: FocusEvent<Document>) => any;
+    onfullscreenchange: (this: Document, ev: Event<Document>) => any;
+    onfullscreenerror: (this: Document, ev: Event<Document>) => any;
+    oninput: (this: Document, ev: Event<Document>) => any;
+    oninvalid: (this: Document, ev: Event<Document>) => any;
     /**
       * Fires when the user presses a key.
       * @param ev The keyboard event
       */
-    onkeydown: (this: Document, ev: KeyboardEvent) => any;
+    onkeydown: (this: Document, ev: KeyboardEvent<Document>) => any;
     /**
       * Fires when the user presses an alphanumeric key.
       * @param ev The event.
       */
-    onkeypress: (this: Document, ev: KeyboardEvent) => any;
+    onkeypress: (this: Document, ev: KeyboardEvent<Document>) => any;
     /**
       * Fires when the user releases a key.
       * @param ev The keyboard event
       */
-    onkeyup: (this: Document, ev: KeyboardEvent) => any;
+    onkeyup: (this: Document, ev: KeyboardEvent<Document>) => any;
     /**
       * Fires immediately after the browser loads the object. 
       * @param ev The event.
       */
-    onload: (this: Document, ev: Event) => any;
+    onload: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs when media data is loaded at the current playback position. 
       * @param ev The event.
       */
-    onloadeddata: (this: Document, ev: Event) => any;
+    onloadeddata: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs when the duration and dimensions of the media have been determined.
       * @param ev The event.
       */
-    onloadedmetadata: (this: Document, ev: Event) => any;
+    onloadedmetadata: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs when Internet Explorer begins looking for media data. 
       * @param ev The event.
       */
-    onloadstart: (this: Document, ev: Event) => any;
+    onloadstart: (this: Document, ev: Event<Document>) => any;
     /**
       * Fires when the user clicks the object with either mouse button. 
       * @param ev The mouse event.
       */
-    onmousedown: (this: Document, ev: MouseEvent) => any;
+    onmousedown: (this: Document, ev: MouseEvent<Document>) => any;
     /**
       * Fires when the user moves the mouse over the object. 
       * @param ev The mouse event.
       */
-    onmousemove: (this: Document, ev: MouseEvent) => any;
+    onmousemove: (this: Document, ev: MouseEvent<Document>) => any;
     /**
       * Fires when the user moves the mouse pointer outside the boundaries of the object. 
       * @param ev The mouse event.
       */
-    onmouseout: (this: Document, ev: MouseEvent) => any;
+    onmouseout: (this: Document, ev: MouseEvent<Document>) => any;
     /**
       * Fires when the user moves the mouse pointer into the object.
       * @param ev The mouse event.
       */
-    onmouseover: (this: Document, ev: MouseEvent) => any;
+    onmouseover: (this: Document, ev: MouseEvent<Document>) => any;
     /**
       * Fires when the user releases a mouse button while the mouse is over the object. 
       * @param ev The mouse event.
       */
-    onmouseup: (this: Document, ev: MouseEvent) => any;
+    onmouseup: (this: Document, ev: MouseEvent<Document>) => any;
     /**
       * Fires when the wheel button is rotated. 
       * @param ev The mouse event
       */
-    onmousewheel: (this: Document, ev: WheelEvent) => any;
-    onmscontentzoom: (this: Document, ev: UIEvent) => any;
-    onmsgesturechange: (this: Document, ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (this: Document, ev: MSGestureEvent) => any;
-    onmsgestureend: (this: Document, ev: MSGestureEvent) => any;
-    onmsgesturehold: (this: Document, ev: MSGestureEvent) => any;
-    onmsgesturestart: (this: Document, ev: MSGestureEvent) => any;
-    onmsgesturetap: (this: Document, ev: MSGestureEvent) => any;
-    onmsinertiastart: (this: Document, ev: MSGestureEvent) => any;
-    onmsmanipulationstatechanged: (this: Document, ev: MSManipulationEvent) => any;
-    onmspointercancel: (this: Document, ev: MSPointerEvent) => any;
-    onmspointerdown: (this: Document, ev: MSPointerEvent) => any;
-    onmspointerenter: (this: Document, ev: MSPointerEvent) => any;
-    onmspointerleave: (this: Document, ev: MSPointerEvent) => any;
-    onmspointermove: (this: Document, ev: MSPointerEvent) => any;
-    onmspointerout: (this: Document, ev: MSPointerEvent) => any;
-    onmspointerover: (this: Document, ev: MSPointerEvent) => any;
-    onmspointerup: (this: Document, ev: MSPointerEvent) => any;
+    onmousewheel: (this: Document, ev: WheelEvent<Document>) => any;
+    onmscontentzoom: (this: Document, ev: UIEvent<Document>) => any;
+    onmsgesturechange: (this: Document, ev: MSGestureEvent<Document>) => any;
+    onmsgesturedoubletap: (this: Document, ev: MSGestureEvent<Document>) => any;
+    onmsgestureend: (this: Document, ev: MSGestureEvent<Document>) => any;
+    onmsgesturehold: (this: Document, ev: MSGestureEvent<Document>) => any;
+    onmsgesturestart: (this: Document, ev: MSGestureEvent<Document>) => any;
+    onmsgesturetap: (this: Document, ev: MSGestureEvent<Document>) => any;
+    onmsinertiastart: (this: Document, ev: MSGestureEvent<Document>) => any;
+    onmsmanipulationstatechanged: (this: Document, ev: MSManipulationEvent<Document>) => any;
+    onmspointercancel: (this: Document, ev: MSPointerEvent<Document>) => any;
+    onmspointerdown: (this: Document, ev: MSPointerEvent<Document>) => any;
+    onmspointerenter: (this: Document, ev: MSPointerEvent<Document>) => any;
+    onmspointerleave: (this: Document, ev: MSPointerEvent<Document>) => any;
+    onmspointermove: (this: Document, ev: MSPointerEvent<Document>) => any;
+    onmspointerout: (this: Document, ev: MSPointerEvent<Document>) => any;
+    onmspointerover: (this: Document, ev: MSPointerEvent<Document>) => any;
+    onmspointerup: (this: Document, ev: MSPointerEvent<Document>) => any;
     /**
       * Occurs when an item is removed from a Jump List of a webpage running in Site Mode. 
       * @param ev The event.
       */
-    onmssitemodejumplistitemremoved: (this: Document, ev: MSSiteModeEvent) => any;
+    onmssitemodejumplistitemremoved: (this: Document, ev: MSSiteModeEvent<Document>) => any;
     /**
       * Occurs when a user clicks a button in a Thumbnail Toolbar of a webpage running in Site Mode.
       * @param ev The event.
       */
-    onmsthumbnailclick: (this: Document, ev: MSSiteModeEvent) => any;
+    onmsthumbnailclick: (this: Document, ev: MSSiteModeEvent<Document>) => any;
     /**
       * Occurs when playback is paused.
       * @param ev The event.
       */
-    onpause: (this: Document, ev: Event) => any;
+    onpause: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs when the play method is requested. 
       * @param ev The event.
       */
-    onplay: (this: Document, ev: Event) => any;
+    onplay: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs when the audio or video has started playing. 
       * @param ev The event.
       */
-    onplaying: (this: Document, ev: Event) => any;
-    onpointerlockchange: (this: Document, ev: Event) => any;
-    onpointerlockerror: (this: Document, ev: Event) => any;
+    onplaying: (this: Document, ev: Event<Document>) => any;
+    onpointerlockchange: (this: Document, ev: Event<Document>) => any;
+    onpointerlockerror: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs to indicate progress while downloading media data. 
       * @param ev The event.
       */
-    onprogress: (this: Document, ev: ProgressEvent) => any;
+    onprogress: (this: Document, ev: ProgressEvent<Document>) => any;
     /**
       * Occurs when the playback rate is increased or decreased. 
       * @param ev The event.
       */
-    onratechange: (this: Document, ev: Event) => any;
+    onratechange: (this: Document, ev: Event<Document>) => any;
     /**
       * Fires when the state of the object has changed.
       * @param ev The event
       */
-    onreadystatechange: (this: Document, ev: Event) => any;
+    onreadystatechange: (this: Document, ev: Event<Document>) => any;
     /**
       * Fires when the user resets a form. 
       * @param ev The event.
       */
-    onreset: (this: Document, ev: Event) => any;
+    onreset: (this: Document, ev: Event<Document>) => any;
     /**
       * Fires when the user repositions the scroll box in the scroll bar on the object. 
       * @param ev The event.
       */
-    onscroll: (this: Document, ev: UIEvent) => any;
+    onscroll: (this: Document, ev: UIEvent<Document>) => any;
     /**
       * Occurs when the seek operation ends. 
       * @param ev The event.
       */
-    onseeked: (this: Document, ev: Event) => any;
+    onseeked: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs when the current playback position is moved. 
       * @param ev The event.
       */
-    onseeking: (this: Document, ev: Event) => any;
+    onseeking: (this: Document, ev: Event<Document>) => any;
     /**
       * Fires when the current selection changes.
       * @param ev The event.
       */
-    onselect: (this: Document, ev: UIEvent) => any;
+    onselect: (this: Document, ev: UIEvent<Document>) => any;
     /**
       * Fires when the selection state of a document changes.
       * @param ev The event.
       */
-    onselectionchange: (this: Document, ev: Event) => any;
-    onselectstart: (this: Document, ev: Event) => any;
+    onselectionchange: (this: Document, ev: Event<Document>) => any;
+    onselectstart: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs when the download has stopped. 
       * @param ev The event.
       */
-    onstalled: (this: Document, ev: Event) => any;
+    onstalled: (this: Document, ev: Event<Document>) => any;
     /**
       * Fires when the user clicks the Stop button or leaves the Web page.
       * @param ev The event.
       */
-    onstop: (this: Document, ev: Event) => any;
-    onsubmit: (this: Document, ev: Event) => any;
+    onstop: (this: Document, ev: Event<Document>) => any;
+    onsubmit: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs if the load operation has been intentionally halted. 
       * @param ev The event.
       */
-    onsuspend: (this: Document, ev: Event) => any;
+    onsuspend: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs to indicate the current playback position.
       * @param ev The event.
       */
-    ontimeupdate: (this: Document, ev: Event) => any;
+    ontimeupdate: (this: Document, ev: Event<Document>) => any;
     ontouchcancel: (ev: TouchEvent) => any;
     ontouchend: (ev: TouchEvent) => any;
     ontouchmove: (ev: TouchEvent) => any;
@@ -3155,14 +3155,14 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Occurs when the volume is changed, or playback is muted or unmuted.
       * @param ev The event.
       */
-    onvolumechange: (this: Document, ev: Event) => any;
+    onvolumechange: (this: Document, ev: Event<Document>) => any;
     /**
       * Occurs when playback stops because the next frame of a video resource is not available. 
       * @param ev The event.
       */
-    onwaiting: (this: Document, ev: Event) => any;
-    onwebkitfullscreenchange: (this: Document, ev: Event) => any;
-    onwebkitfullscreenerror: (this: Document, ev: Event) => any;
+    onwaiting: (this: Document, ev: Event<Document>) => any;
+    onwebkitfullscreenchange: (this: Document, ev: Event<Document>) => any;
+    onwebkitfullscreenerror: (this: Document, ev: Event<Document>) => any;
     plugins: HTMLCollectionOf<HTMLEmbedElement>;
     readonly pointerLockElement: Element;
     /**
@@ -3441,7 +3441,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       */
     writeln(...content: string[]): void;
     addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<Document>, useCapture?: boolean): void;
 }
 
 declare var Document: {
@@ -3472,7 +3472,7 @@ declare var DocumentType: {
     new(): DocumentType;
 }
 
-interface DragEvent extends MouseEvent {
+interface DragEvent<T extends EventTarget<T> = EventTarget> extends MouseEvent<T> {
     readonly dataTransfer: DataTransfer;
     initDragEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, dataTransferArg: DataTransfer): void;
     msConvertURL(file: File, targetType: string, targetURL?: string): void;
@@ -3547,7 +3547,7 @@ interface ElementEventMap extends GlobalEventHandlersEventMap {
     "webkitfullscreenerror": Event;
 }
 
-interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelector, ChildNode, ParentNode {
+interface Element extends Node, GlobalEventHandlers<Element>, ElementTraversal, NodeSelector, ChildNode, ParentNode {
     readonly classList: DOMTokenList;
     className: string;
     readonly clientHeight: number;
@@ -3558,33 +3558,33 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     innerHTML: string;
     msContentZoomFactor: number;
     readonly msRegionOverflow: string;
-    onariarequest: (this: Element, ev: Event) => any;
-    oncommand: (this: Element, ev: Event) => any;
-    ongotpointercapture: (this: Element, ev: PointerEvent) => any;
-    onlostpointercapture: (this: Element, ev: PointerEvent) => any;
-    onmsgesturechange: (this: Element, ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (this: Element, ev: MSGestureEvent) => any;
-    onmsgestureend: (this: Element, ev: MSGestureEvent) => any;
-    onmsgesturehold: (this: Element, ev: MSGestureEvent) => any;
-    onmsgesturestart: (this: Element, ev: MSGestureEvent) => any;
-    onmsgesturetap: (this: Element, ev: MSGestureEvent) => any;
-    onmsgotpointercapture: (this: Element, ev: MSPointerEvent) => any;
-    onmsinertiastart: (this: Element, ev: MSGestureEvent) => any;
-    onmslostpointercapture: (this: Element, ev: MSPointerEvent) => any;
-    onmspointercancel: (this: Element, ev: MSPointerEvent) => any;
-    onmspointerdown: (this: Element, ev: MSPointerEvent) => any;
-    onmspointerenter: (this: Element, ev: MSPointerEvent) => any;
-    onmspointerleave: (this: Element, ev: MSPointerEvent) => any;
-    onmspointermove: (this: Element, ev: MSPointerEvent) => any;
-    onmspointerout: (this: Element, ev: MSPointerEvent) => any;
-    onmspointerover: (this: Element, ev: MSPointerEvent) => any;
-    onmspointerup: (this: Element, ev: MSPointerEvent) => any;
+    onariarequest: (this: Element, ev: Event<Element>) => any;
+    oncommand: (this: Element, ev: Event<Element>) => any;
+    ongotpointercapture: (this: Element, ev: PointerEvent<Element>) => any;
+    onlostpointercapture: (this: Element, ev: PointerEvent<Element>) => any;
+    onmsgesturechange: (this: Element, ev: MSGestureEvent<Element>) => any;
+    onmsgesturedoubletap: (this: Element, ev: MSGestureEvent<Element>) => any;
+    onmsgestureend: (this: Element, ev: MSGestureEvent<Element>) => any;
+    onmsgesturehold: (this: Element, ev: MSGestureEvent<Element>) => any;
+    onmsgesturestart: (this: Element, ev: MSGestureEvent<Element>) => any;
+    onmsgesturetap: (this: Element, ev: MSGestureEvent<Element>) => any;
+    onmsgotpointercapture: (this: Element, ev: MSPointerEvent<Element>) => any;
+    onmsinertiastart: (this: Element, ev: MSGestureEvent<Element>) => any;
+    onmslostpointercapture: (this: Element, ev: MSPointerEvent<Element>) => any;
+    onmspointercancel: (this: Element, ev: MSPointerEvent<Element>) => any;
+    onmspointerdown: (this: Element, ev: MSPointerEvent<Element>) => any;
+    onmspointerenter: (this: Element, ev: MSPointerEvent<Element>) => any;
+    onmspointerleave: (this: Element, ev: MSPointerEvent<Element>) => any;
+    onmspointermove: (this: Element, ev: MSPointerEvent<Element>) => any;
+    onmspointerout: (this: Element, ev: MSPointerEvent<Element>) => any;
+    onmspointerover: (this: Element, ev: MSPointerEvent<Element>) => any;
+    onmspointerup: (this: Element, ev: MSPointerEvent<Element>) => any;
     ontouchcancel: (ev: TouchEvent) => any;
     ontouchend: (ev: TouchEvent) => any;
     ontouchmove: (ev: TouchEvent) => any;
     ontouchstart: (ev: TouchEvent) => any;
-    onwebkitfullscreenchange: (this: Element, ev: Event) => any;
-    onwebkitfullscreenerror: (this: Element, ev: Event) => any;
+    onwebkitfullscreenchange: (this: Element, ev: Event<Element>) => any;
+    onwebkitfullscreenerror: (this: Element, ev: Event<Element>) => any;
     outerHTML: string;
     readonly prefix: string | null;
     readonly scrollHeight: number;
@@ -3643,7 +3643,7 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     insertAdjacentText(where: string, text: string): void;
     attachShadow(shadowRootInitDict: ShadowRootInit): ShadowRoot;
     addEventListener<K extends keyof ElementEventMap>(type: K, listener: (this: Element, ev: ElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<Element>, useCapture?: boolean): void;
 }
 
 declare var Element: {
@@ -3651,7 +3651,7 @@ declare var Element: {
     new(): Element;
 }
 
-interface ErrorEvent extends Event {
+interface ErrorEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly colno: number;
     readonly error: any;
     readonly filename: string;
@@ -3665,17 +3665,17 @@ declare var ErrorEvent: {
     new(type: string, errorEventInitDict?: ErrorEventInit): ErrorEvent;
 }
 
-interface Event {
+interface Event<T extends EventTarget<T> = EventTarget> {
     readonly bubbles: boolean;
     cancelBubble: boolean;
     readonly cancelable: boolean;
-    readonly currentTarget: EventTarget;
+    readonly currentTarget: T;
     readonly defaultPrevented: boolean;
     readonly eventPhase: number;
     readonly isTrusted: boolean;
     returnValue: boolean;
     readonly srcElement: Element | null;
-    readonly target: EventTarget;
+    readonly target: T;
     readonly timeStamp: number;
     readonly type: string;
     readonly scoped: boolean;
@@ -3697,12 +3697,6 @@ declare var Event: {
     readonly CAPTURING_PHASE: number;
 }
 
-interface EventTarget {
-    addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    dispatchEvent(evt: Event): boolean;
-    removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
 declare var EventTarget: {
     prototype: EventTarget;
     new(): EventTarget;
@@ -3753,14 +3747,14 @@ declare var FileList: {
     new(): FileList;
 }
 
-interface FileReader extends EventTarget, MSBaseReader {
+interface FileReader extends EventTarget, MSBaseReader<FileReader> {
     readonly error: DOMError;
     readAsArrayBuffer(blob: Blob): void;
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
     readAsText(blob: Blob, encoding?: string): void;
     addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: FileReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<FileReader>, useCapture?: boolean): void;
 }
 
 declare var FileReader: {
@@ -3768,7 +3762,7 @@ declare var FileReader: {
     new(): FileReader;
 }
 
-interface FocusEvent extends UIEvent {
+interface FocusEvent<T extends EventTarget<T> = EventTarget> extends UIEvent<T> {
     readonly relatedTarget: EventTarget;
     initFocusEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, relatedTargetArg: EventTarget): void;
 }
@@ -3778,7 +3772,7 @@ declare var FocusEvent: {
     new(typeArg: string, eventInitDict?: FocusEventInit): FocusEvent;
 }
 
-interface FocusNavigationEvent extends Event {
+interface FocusNavigationEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly navigationReason: string;
     readonly originHeight: number;
     readonly originLeft: number;
@@ -3835,7 +3829,7 @@ declare var GamepadButton: {
     new(): GamepadButton;
 }
 
-interface GamepadEvent extends Event {
+interface GamepadEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly gamepad: Gamepad;
 }
 
@@ -3948,7 +3942,7 @@ interface HTMLAnchorElement extends HTMLElement {
       */
     toString(): string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAnchorElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLAnchorElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLAnchorElement: {
@@ -4022,7 +4016,7 @@ interface HTMLAppletElement extends HTMLElement {
     vspace: number;
     width: number;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAppletElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLAppletElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLAppletElement: {
@@ -4090,7 +4084,7 @@ interface HTMLAreaElement extends HTMLElement {
       */
     toString(): string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAreaElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLAreaElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLAreaElement: {
@@ -4108,7 +4102,7 @@ declare var HTMLAreasCollection: {
 
 interface HTMLAudioElement extends HTMLMediaElement {
     addEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLAudioElement, ev: HTMLMediaElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLAudioElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLAudioElement: {
@@ -4122,7 +4116,7 @@ interface HTMLBRElement extends HTMLElement {
       */
     clear: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBRElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLBRElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLBRElement: {
@@ -4140,7 +4134,7 @@ interface HTMLBaseElement extends HTMLElement {
       */
     target: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBaseElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLBaseElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLBaseElement: {
@@ -4158,7 +4152,7 @@ interface HTMLBaseFontElement extends HTMLElement, DOML2DeprecatedColorProperty
       */
     size: number;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBaseFontElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLBaseFontElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLBaseFontElement: {
@@ -4195,29 +4189,29 @@ interface HTMLBodyElement extends HTMLElement {
     bgProperties: string;
     link: any;
     noWrap: boolean;
-    onafterprint: (this: HTMLBodyElement, ev: Event) => any;
-    onbeforeprint: (this: HTMLBodyElement, ev: Event) => any;
-    onbeforeunload: (this: HTMLBodyElement, ev: BeforeUnloadEvent) => any;
-    onblur: (this: HTMLBodyElement, ev: FocusEvent) => any;
-    onerror: (this: HTMLBodyElement, ev: ErrorEvent) => any;
-    onfocus: (this: HTMLBodyElement, ev: FocusEvent) => any;
-    onhashchange: (this: HTMLBodyElement, ev: HashChangeEvent) => any;
-    onload: (this: HTMLBodyElement, ev: Event) => any;
-    onmessage: (this: HTMLBodyElement, ev: MessageEvent) => any;
-    onoffline: (this: HTMLBodyElement, ev: Event) => any;
-    ononline: (this: HTMLBodyElement, ev: Event) => any;
-    onorientationchange: (this: HTMLBodyElement, ev: Event) => any;
-    onpagehide: (this: HTMLBodyElement, ev: PageTransitionEvent) => any;
-    onpageshow: (this: HTMLBodyElement, ev: PageTransitionEvent) => any;
-    onpopstate: (this: HTMLBodyElement, ev: PopStateEvent) => any;
-    onresize: (this: HTMLBodyElement, ev: UIEvent) => any;
-    onscroll: (this: HTMLBodyElement, ev: UIEvent) => any;
-    onstorage: (this: HTMLBodyElement, ev: StorageEvent) => any;
-    onunload: (this: HTMLBodyElement, ev: Event) => any;
+    onafterprint: (this: HTMLBodyElement, ev: Event<HTMLBodyElement>) => any;
+    onbeforeprint: (this: HTMLBodyElement, ev: Event<HTMLBodyElement>) => any;
+    onbeforeunload: (this: HTMLBodyElement, ev: BeforeUnloadEvent<HTMLBodyElement>) => any;
+    onblur: (this: HTMLBodyElement, ev: FocusEvent<HTMLBodyElement>) => any;
+    onerror: (this: HTMLBodyElement, ev: ErrorEvent<HTMLBodyElement>) => any;
+    onfocus: (this: HTMLBodyElement, ev: FocusEvent<HTMLBodyElement>) => any;
+    onhashchange: (this: HTMLBodyElement, ev: HashChangeEvent<HTMLBodyElement>) => any;
+    onload: (this: HTMLBodyElement, ev: Event<HTMLBodyElement>) => any;
+    onmessage: (this: HTMLBodyElement, ev: MessageEvent<HTMLBodyElement>) => any;
+    onoffline: (this: HTMLBodyElement, ev: Event<HTMLBodyElement>) => any;
+    ononline: (this: HTMLBodyElement, ev: Event<HTMLBodyElement>) => any;
+    onorientationchange: (this: HTMLBodyElement, ev: Event<HTMLBodyElement>) => any;
+    onpagehide: (this: HTMLBodyElement, ev: PageTransitionEvent<HTMLBodyElement>) => any;
+    onpageshow: (this: HTMLBodyElement, ev: PageTransitionEvent<HTMLBodyElement>) => any;
+    onpopstate: (this: HTMLBodyElement, ev: PopStateEvent<HTMLBodyElement>) => any;
+    onresize: (this: HTMLBodyElement, ev: UIEvent<HTMLBodyElement>) => any;
+    onscroll: (this: HTMLBodyElement, ev: UIEvent<HTMLBodyElement>) => any;
+    onstorage: (this: HTMLBodyElement, ev: StorageEvent<HTMLBodyElement>) => any;
+    onunload: (this: HTMLBodyElement, ev: Event<HTMLBodyElement>) => any;
     text: any;
     vLink: any;
     addEventListener<K extends keyof HTMLBodyElementEventMap>(type: K, listener: (this: HTMLBodyElement, ev: HTMLBodyElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLBodyElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLBodyElement: {
@@ -4290,7 +4284,7 @@ interface HTMLButtonElement extends HTMLElement {
       */
     setCustomValidity(error: string): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLButtonElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLButtonElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLButtonElement: {
@@ -4325,7 +4319,7 @@ interface HTMLCanvasElement extends HTMLElement {
     toDataURL(type?: string, ...args: any[]): string;
     toBlob(callback: (result: Blob | null) => void, type?: string, ...arguments: any[]): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLCanvasElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLCanvasElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLCanvasElement: {
@@ -4360,7 +4354,7 @@ declare var HTMLCollection: {
 interface HTMLDListElement extends HTMLElement {
     compact: boolean;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLDListElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLDListElement: {
@@ -4371,7 +4365,7 @@ declare var HTMLDListElement: {
 interface HTMLDataElement extends HTMLElement {
     value: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDataElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLDataElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLDataElement: {
@@ -4382,7 +4376,7 @@ declare var HTMLDataElement: {
 interface HTMLDataListElement extends HTMLElement {
     options: HTMLCollectionOf<HTMLOptionElement>;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDataListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLDataListElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLDataListElement: {
@@ -4393,7 +4387,7 @@ declare var HTMLDataListElement: {
 interface HTMLDirectoryElement extends HTMLElement {
     compact: boolean;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDirectoryElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLDirectoryElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLDirectoryElement: {
@@ -4411,7 +4405,7 @@ interface HTMLDivElement extends HTMLElement {
       */
     noWrap: boolean;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDivElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLDivElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLDivElement: {
@@ -4421,7 +4415,7 @@ declare var HTMLDivElement: {
 
 interface HTMLDocument extends Document {
     addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: HTMLDocument, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLDocument>, useCapture?: boolean): void;
 }
 
 declare var HTMLDocument: {
@@ -4516,73 +4510,73 @@ interface HTMLElement extends Element {
     readonly offsetParent: Element;
     readonly offsetTop: number;
     readonly offsetWidth: number;
-    onabort: (this: HTMLElement, ev: UIEvent) => any;
-    onactivate: (this: HTMLElement, ev: UIEvent) => any;
-    onbeforeactivate: (this: HTMLElement, ev: UIEvent) => any;
-    onbeforecopy: (this: HTMLElement, ev: ClipboardEvent) => any;
-    onbeforecut: (this: HTMLElement, ev: ClipboardEvent) => any;
-    onbeforedeactivate: (this: HTMLElement, ev: UIEvent) => any;
-    onbeforepaste: (this: HTMLElement, ev: ClipboardEvent) => any;
-    onblur: (this: HTMLElement, ev: FocusEvent) => any;
-    oncanplay: (this: HTMLElement, ev: Event) => any;
-    oncanplaythrough: (this: HTMLElement, ev: Event) => any;
-    onchange: (this: HTMLElement, ev: Event) => any;
-    onclick: (this: HTMLElement, ev: MouseEvent) => any;
-    oncontextmenu: (this: HTMLElement, ev: PointerEvent) => any;
-    oncopy: (this: HTMLElement, ev: ClipboardEvent) => any;
-    oncuechange: (this: HTMLElement, ev: Event) => any;
-    oncut: (this: HTMLElement, ev: ClipboardEvent) => any;
-    ondblclick: (this: HTMLElement, ev: MouseEvent) => any;
-    ondeactivate: (this: HTMLElement, ev: UIEvent) => any;
-    ondrag: (this: HTMLElement, ev: DragEvent) => any;
-    ondragend: (this: HTMLElement, ev: DragEvent) => any;
-    ondragenter: (this: HTMLElement, ev: DragEvent) => any;
-    ondragleave: (this: HTMLElement, ev: DragEvent) => any;
-    ondragover: (this: HTMLElement, ev: DragEvent) => any;
-    ondragstart: (this: HTMLElement, ev: DragEvent) => any;
-    ondrop: (this: HTMLElement, ev: DragEvent) => any;
-    ondurationchange: (this: HTMLElement, ev: Event) => any;
-    onemptied: (this: HTMLElement, ev: Event) => any;
-    onended: (this: HTMLElement, ev: MediaStreamErrorEvent) => any;
-    onerror: (this: HTMLElement, ev: ErrorEvent) => any;
-    onfocus: (this: HTMLElement, ev: FocusEvent) => any;
-    oninput: (this: HTMLElement, ev: Event) => any;
-    oninvalid: (this: HTMLElement, ev: Event) => any;
-    onkeydown: (this: HTMLElement, ev: KeyboardEvent) => any;
-    onkeypress: (this: HTMLElement, ev: KeyboardEvent) => any;
-    onkeyup: (this: HTMLElement, ev: KeyboardEvent) => any;
-    onload: (this: HTMLElement, ev: Event) => any;
-    onloadeddata: (this: HTMLElement, ev: Event) => any;
-    onloadedmetadata: (this: HTMLElement, ev: Event) => any;
-    onloadstart: (this: HTMLElement, ev: Event) => any;
-    onmousedown: (this: HTMLElement, ev: MouseEvent) => any;
-    onmouseenter: (this: HTMLElement, ev: MouseEvent) => any;
-    onmouseleave: (this: HTMLElement, ev: MouseEvent) => any;
-    onmousemove: (this: HTMLElement, ev: MouseEvent) => any;
-    onmouseout: (this: HTMLElement, ev: MouseEvent) => any;
-    onmouseover: (this: HTMLElement, ev: MouseEvent) => any;
-    onmouseup: (this: HTMLElement, ev: MouseEvent) => any;
-    onmousewheel: (this: HTMLElement, ev: WheelEvent) => any;
-    onmscontentzoom: (this: HTMLElement, ev: UIEvent) => any;
-    onmsmanipulationstatechanged: (this: HTMLElement, ev: MSManipulationEvent) => any;
-    onpaste: (this: HTMLElement, ev: ClipboardEvent) => any;
-    onpause: (this: HTMLElement, ev: Event) => any;
-    onplay: (this: HTMLElement, ev: Event) => any;
-    onplaying: (this: HTMLElement, ev: Event) => any;
-    onprogress: (this: HTMLElement, ev: ProgressEvent) => any;
-    onratechange: (this: HTMLElement, ev: Event) => any;
-    onreset: (this: HTMLElement, ev: Event) => any;
-    onscroll: (this: HTMLElement, ev: UIEvent) => any;
-    onseeked: (this: HTMLElement, ev: Event) => any;
-    onseeking: (this: HTMLElement, ev: Event) => any;
-    onselect: (this: HTMLElement, ev: UIEvent) => any;
-    onselectstart: (this: HTMLElement, ev: Event) => any;
-    onstalled: (this: HTMLElement, ev: Event) => any;
-    onsubmit: (this: HTMLElement, ev: Event) => any;
-    onsuspend: (this: HTMLElement, ev: Event) => any;
-    ontimeupdate: (this: HTMLElement, ev: Event) => any;
-    onvolumechange: (this: HTMLElement, ev: Event) => any;
-    onwaiting: (this: HTMLElement, ev: Event) => any;
+    onabort: (this: HTMLElement, ev: UIEvent<HTMLElement>) => any;
+    onactivate: (this: HTMLElement, ev: UIEvent<HTMLElement>) => any;
+    onbeforeactivate: (this: HTMLElement, ev: UIEvent<HTMLElement>) => any;
+    onbeforecopy: (this: HTMLElement, ev: ClipboardEvent<HTMLElement>) => any;
+    onbeforecut: (this: HTMLElement, ev: ClipboardEvent<HTMLElement>) => any;
+    onbeforedeactivate: (this: HTMLElement, ev: UIEvent<HTMLElement>) => any;
+    onbeforepaste: (this: HTMLElement, ev: ClipboardEvent<HTMLElement>) => any;
+    onblur: (this: HTMLElement, ev: FocusEvent<HTMLElement>) => any;
+    oncanplay: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    oncanplaythrough: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onchange: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onclick: (this: HTMLElement, ev: MouseEvent<HTMLElement>) => any;
+    oncontextmenu: (this: HTMLElement, ev: PointerEvent<HTMLElement>) => any;
+    oncopy: (this: HTMLElement, ev: ClipboardEvent<HTMLElement>) => any;
+    oncuechange: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    oncut: (this: HTMLElement, ev: ClipboardEvent<HTMLElement>) => any;
+    ondblclick: (this: HTMLElement, ev: MouseEvent<HTMLElement>) => any;
+    ondeactivate: (this: HTMLElement, ev: UIEvent<HTMLElement>) => any;
+    ondrag: (this: HTMLElement, ev: DragEvent<HTMLElement>) => any;
+    ondragend: (this: HTMLElement, ev: DragEvent<HTMLElement>) => any;
+    ondragenter: (this: HTMLElement, ev: DragEvent<HTMLElement>) => any;
+    ondragleave: (this: HTMLElement, ev: DragEvent<HTMLElement>) => any;
+    ondragover: (this: HTMLElement, ev: DragEvent<HTMLElement>) => any;
+    ondragstart: (this: HTMLElement, ev: DragEvent<HTMLElement>) => any;
+    ondrop: (this: HTMLElement, ev: DragEvent<HTMLElement>) => any;
+    ondurationchange: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onemptied: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onended: (this: HTMLElement, ev: MediaStreamErrorEvent<HTMLElement>) => any;
+    onerror: (this: HTMLElement, ev: ErrorEvent<HTMLElement>) => any;
+    onfocus: (this: HTMLElement, ev: FocusEvent<HTMLElement>) => any;
+    oninput: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    oninvalid: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onkeydown: (this: HTMLElement, ev: KeyboardEvent<HTMLElement>) => any;
+    onkeypress: (this: HTMLElement, ev: KeyboardEvent<HTMLElement>) => any;
+    onkeyup: (this: HTMLElement, ev: KeyboardEvent<HTMLElement>) => any;
+    onload: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onloadeddata: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onloadedmetadata: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onloadstart: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onmousedown: (this: HTMLElement, ev: MouseEvent<HTMLElement>) => any;
+    onmouseenter: (this: HTMLElement, ev: MouseEvent<HTMLElement>) => any;
+    onmouseleave: (this: HTMLElement, ev: MouseEvent<HTMLElement>) => any;
+    onmousemove: (this: HTMLElement, ev: MouseEvent<HTMLElement>) => any;
+    onmouseout: (this: HTMLElement, ev: MouseEvent<HTMLElement>) => any;
+    onmouseover: (this: HTMLElement, ev: MouseEvent<HTMLElement>) => any;
+    onmouseup: (this: HTMLElement, ev: MouseEvent<HTMLElement>) => any;
+    onmousewheel: (this: HTMLElement, ev: WheelEvent<HTMLElement>) => any;
+    onmscontentzoom: (this: HTMLElement, ev: UIEvent<HTMLElement>) => any;
+    onmsmanipulationstatechanged: (this: HTMLElement, ev: MSManipulationEvent<HTMLElement>) => any;
+    onpaste: (this: HTMLElement, ev: ClipboardEvent<HTMLElement>) => any;
+    onpause: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onplay: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onplaying: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onprogress: (this: HTMLElement, ev: ProgressEvent<HTMLElement>) => any;
+    onratechange: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onreset: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onscroll: (this: HTMLElement, ev: UIEvent<HTMLElement>) => any;
+    onseeked: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onseeking: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onselect: (this: HTMLElement, ev: UIEvent<HTMLElement>) => any;
+    onselectstart: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onstalled: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onsubmit: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onsuspend: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    ontimeupdate: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onvolumechange: (this: HTMLElement, ev: Event<HTMLElement>) => any;
+    onwaiting: (this: HTMLElement, ev: Event<HTMLElement>) => any;
     outerText: string;
     spellcheck: boolean;
     readonly style: CSSStyleDeclaration;
@@ -4594,7 +4588,7 @@ interface HTMLElement extends Element {
     focus(): void;
     msGetInputContext(): MSInputMethodContext;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLElement: {
@@ -4650,7 +4644,7 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
       */
     width: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLEmbedElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLEmbedElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLEmbedElement: {
@@ -4691,7 +4685,7 @@ interface HTMLFieldSetElement extends HTMLElement {
       */
     setCustomValidity(error: string): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFieldSetElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLFieldSetElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLFieldSetElement: {
@@ -4705,7 +4699,7 @@ interface HTMLFontElement extends HTMLElement, DOML2DeprecatedColorProperty, DOM
       */
     face: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFontElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLFontElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLFontElement: {
@@ -4790,7 +4784,7 @@ interface HTMLFormElement extends HTMLElement {
       */
     submit(): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFormElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLFormElement>, useCapture?: boolean): void;
     [name: string]: any;
 }
 
@@ -4855,7 +4849,7 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Raised when the object has been completely received from the server.
       */
-    onload: (this: HTMLFrameElement, ev: Event) => any;
+    onload: (this: HTMLFrameElement, ev: Event<HTMLFrameElement>) => any;
     /**
       * Sets or retrieves whether the frame can be scrolled.
       */
@@ -4869,7 +4863,7 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
       */
     width: string | number;
     addEventListener<K extends keyof HTMLFrameElementEventMap>(type: K, listener: (this: HTMLFrameElement, ev: HTMLFrameElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLFrameElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLFrameElement: {
@@ -4918,37 +4912,37 @@ interface HTMLFrameSetElement extends HTMLElement {
       */
     frameSpacing: any;
     name: string;
-    onafterprint: (this: HTMLFrameSetElement, ev: Event) => any;
-    onbeforeprint: (this: HTMLFrameSetElement, ev: Event) => any;
-    onbeforeunload: (this: HTMLFrameSetElement, ev: BeforeUnloadEvent) => any;
+    onafterprint: (this: HTMLFrameSetElement, ev: Event<HTMLFrameSetElement>) => any;
+    onbeforeprint: (this: HTMLFrameSetElement, ev: Event<HTMLFrameSetElement>) => any;
+    onbeforeunload: (this: HTMLFrameSetElement, ev: BeforeUnloadEvent<HTMLFrameSetElement>) => any;
     /**
       * Fires when the object loses the input focus.
       */
-    onblur: (this: HTMLFrameSetElement, ev: FocusEvent) => any;
-    onerror: (this: HTMLFrameSetElement, ev: ErrorEvent) => any;
+    onblur: (this: HTMLFrameSetElement, ev: FocusEvent<HTMLFrameSetElement>) => any;
+    onerror: (this: HTMLFrameSetElement, ev: ErrorEvent<HTMLFrameSetElement>) => any;
     /**
       * Fires when the object receives focus.
       */
-    onfocus: (this: HTMLFrameSetElement, ev: FocusEvent) => any;
-    onhashchange: (this: HTMLFrameSetElement, ev: HashChangeEvent) => any;
-    onload: (this: HTMLFrameSetElement, ev: Event) => any;
-    onmessage: (this: HTMLFrameSetElement, ev: MessageEvent) => any;
-    onoffline: (this: HTMLFrameSetElement, ev: Event) => any;
-    ononline: (this: HTMLFrameSetElement, ev: Event) => any;
-    onorientationchange: (this: HTMLFrameSetElement, ev: Event) => any;
-    onpagehide: (this: HTMLFrameSetElement, ev: PageTransitionEvent) => any;
-    onpageshow: (this: HTMLFrameSetElement, ev: PageTransitionEvent) => any;
-    onpopstate: (this: HTMLFrameSetElement, ev: PopStateEvent) => any;
-    onresize: (this: HTMLFrameSetElement, ev: UIEvent) => any;
-    onscroll: (this: HTMLFrameSetElement, ev: UIEvent) => any;
-    onstorage: (this: HTMLFrameSetElement, ev: StorageEvent) => any;
-    onunload: (this: HTMLFrameSetElement, ev: Event) => any;
+    onfocus: (this: HTMLFrameSetElement, ev: FocusEvent<HTMLFrameSetElement>) => any;
+    onhashchange: (this: HTMLFrameSetElement, ev: HashChangeEvent<HTMLFrameSetElement>) => any;
+    onload: (this: HTMLFrameSetElement, ev: Event<HTMLFrameSetElement>) => any;
+    onmessage: (this: HTMLFrameSetElement, ev: MessageEvent<HTMLFrameSetElement>) => any;
+    onoffline: (this: HTMLFrameSetElement, ev: Event<HTMLFrameSetElement>) => any;
+    ononline: (this: HTMLFrameSetElement, ev: Event<HTMLFrameSetElement>) => any;
+    onorientationchange: (this: HTMLFrameSetElement, ev: Event<HTMLFrameSetElement>) => any;
+    onpagehide: (this: HTMLFrameSetElement, ev: PageTransitionEvent<HTMLFrameSetElement>) => any;
+    onpageshow: (this: HTMLFrameSetElement, ev: PageTransitionEvent<HTMLFrameSetElement>) => any;
+    onpopstate: (this: HTMLFrameSetElement, ev: PopStateEvent<HTMLFrameSetElement>) => any;
+    onresize: (this: HTMLFrameSetElement, ev: UIEvent<HTMLFrameSetElement>) => any;
+    onscroll: (this: HTMLFrameSetElement, ev: UIEvent<HTMLFrameSetElement>) => any;
+    onstorage: (this: HTMLFrameSetElement, ev: StorageEvent<HTMLFrameSetElement>) => any;
+    onunload: (this: HTMLFrameSetElement, ev: Event<HTMLFrameSetElement>) => any;
     /**
       * Sets or retrieves the frame heights of the object.
       */
     rows: string;
     addEventListener<K extends keyof HTMLFrameSetElementEventMap>(type: K, listener: (this: HTMLFrameSetElement, ev: HTMLFrameSetElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLFrameSetElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLFrameSetElement: {
@@ -4970,7 +4964,7 @@ interface HTMLHRElement extends HTMLElement, DOML2DeprecatedColorProperty, DOML2
       */
     width: number;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHRElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLHRElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLHRElement: {
@@ -4981,7 +4975,7 @@ declare var HTMLHRElement: {
 interface HTMLHeadElement extends HTMLElement {
     profile: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHeadElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLHeadElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLHeadElement: {
@@ -4995,7 +4989,7 @@ interface HTMLHeadingElement extends HTMLElement {
       */
     align: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHeadingElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLHeadingElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLHeadingElement: {
@@ -5009,7 +5003,7 @@ interface HTMLHtmlElement extends HTMLElement {
       */
     version: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHtmlElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLHtmlElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLHtmlElement: {
@@ -5079,7 +5073,7 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Raised when the object has been completely received from the server.
       */
-    onload: (this: HTMLIFrameElement, ev: Event) => any;
+    onload: (this: HTMLIFrameElement, ev: Event<HTMLIFrameElement>) => any;
     readonly sandbox: DOMSettableTokenList;
     /**
       * Sets or retrieves whether the frame can be scrolled.
@@ -5098,7 +5092,7 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
       */
     width: string;
     addEventListener<K extends keyof HTMLIFrameElementEventMap>(type: K, listener: (this: HTMLIFrameElement, ev: HTMLIFrameElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLIFrameElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLIFrameElement: {
@@ -5189,7 +5183,7 @@ interface HTMLImageElement extends HTMLElement {
     readonly y: number;
     msGetAsCastingSource(): any;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLImageElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLImageElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLImageElement: {
@@ -5401,7 +5395,7 @@ interface HTMLInputElement extends HTMLElement {
       */
     stepUp(n?: number): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLInputElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLInputElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLInputElement: {
@@ -5416,7 +5410,7 @@ interface HTMLLIElement extends HTMLElement {
       */
     value: number;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLIElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLLIElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLLIElement: {
@@ -5434,7 +5428,7 @@ interface HTMLLabelElement extends HTMLElement {
       */
     htmlFor: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLabelElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLLabelElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLLabelElement: {
@@ -5452,7 +5446,7 @@ interface HTMLLegendElement extends HTMLElement {
       */
     readonly form: HTMLFormElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLegendElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLLegendElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLLegendElement: {
@@ -5497,7 +5491,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
     import?: Document;
     integrity: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLinkElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLLinkElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLLinkElement: {
@@ -5515,7 +5509,7 @@ interface HTMLMapElement extends HTMLElement {
       */
     name: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMapElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLMapElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLMapElement: {
@@ -5536,9 +5530,9 @@ interface HTMLMarqueeElement extends HTMLElement {
     height: string;
     hspace: number;
     loop: number;
-    onbounce: (this: HTMLMarqueeElement, ev: Event) => any;
-    onfinish: (this: HTMLMarqueeElement, ev: Event) => any;
-    onstart: (this: HTMLMarqueeElement, ev: Event) => any;
+    onbounce: (this: HTMLMarqueeElement, ev: Event<HTMLMarqueeElement>) => any;
+    onfinish: (this: HTMLMarqueeElement, ev: Event<HTMLMarqueeElement>) => any;
+    onstart: (this: HTMLMarqueeElement, ev: Event<HTMLMarqueeElement>) => any;
     scrollAmount: number;
     scrollDelay: number;
     trueSpeed: boolean;
@@ -5547,7 +5541,7 @@ interface HTMLMarqueeElement extends HTMLElement {
     start(): void;
     stop(): void;
     addEventListener<K extends keyof HTMLMarqueeElementEventMap>(type: K, listener: (this: HTMLMarqueeElement, ev: HTMLMarqueeElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLMarqueeElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLMarqueeElement: {
@@ -5649,8 +5643,8 @@ interface HTMLMediaElement extends HTMLElement {
       * Gets the current network activity for the element.
       */
     readonly networkState: number;
-    onencrypted: (this: HTMLMediaElement, ev: MediaEncryptedEvent) => any;
-    onmsneedkey: (this: HTMLMediaElement, ev: MSMediaKeyNeededEvent) => any;
+    onencrypted: (this: HTMLMediaElement, ev: MediaEncryptedEvent<HTMLMediaElement>) => any;
+    onmsneedkey: (this: HTMLMediaElement, ev: MSMediaKeyNeededEvent<HTMLMediaElement>) => any;
     /**
       * Gets a flag that specifies whether playback is paused.
       */
@@ -5729,7 +5723,7 @@ interface HTMLMediaElement extends HTMLElement {
     readonly NETWORK_LOADING: number;
     readonly NETWORK_NO_SOURCE: number;
     addEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLMediaElement, ev: HTMLMediaElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLMediaElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLMediaElement: {
@@ -5750,7 +5744,7 @@ interface HTMLMenuElement extends HTMLElement {
     compact: boolean;
     type: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMenuElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLMenuElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLMenuElement: {
@@ -5784,7 +5778,7 @@ interface HTMLMetaElement extends HTMLElement {
       */
     url: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMetaElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLMetaElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLMetaElement: {
@@ -5800,7 +5794,7 @@ interface HTMLMeterElement extends HTMLElement {
     optimum: number;
     value: number;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMeterElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLMeterElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLMeterElement: {
@@ -5818,7 +5812,7 @@ interface HTMLModElement extends HTMLElement {
       */
     dateTime: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLModElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLModElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLModElement: {
@@ -5834,7 +5828,7 @@ interface HTMLOListElement extends HTMLElement {
     start: number;
     type: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLOListElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLOListElement: {
@@ -5951,7 +5945,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
       */
     setCustomValidity(error: string): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLObjectElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLObjectElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLObjectElement: {
@@ -5990,7 +5984,7 @@ interface HTMLOptGroupElement extends HTMLElement {
       */
     value: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOptGroupElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLOptGroupElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLOptGroupElement: {
@@ -6029,7 +6023,7 @@ interface HTMLOptionElement extends HTMLElement {
       */
     value: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOptionElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLOptionElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLOptionElement: {
@@ -6063,7 +6057,7 @@ interface HTMLOutputElement extends HTMLElement {
     reportValidity(): boolean;
     setCustomValidity(error: string): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOutputElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLOutputElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLOutputElement: {
@@ -6078,7 +6072,7 @@ interface HTMLParagraphElement extends HTMLElement {
     align: string;
     clear: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLParagraphElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLParagraphElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLParagraphElement: {
@@ -6104,7 +6098,7 @@ interface HTMLParamElement extends HTMLElement {
       */
     valueType: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLParamElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLParamElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLParamElement: {
@@ -6114,7 +6108,7 @@ declare var HTMLParamElement: {
 
 interface HTMLPictureElement extends HTMLElement {
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLPictureElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLPictureElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLPictureElement: {
@@ -6128,7 +6122,7 @@ interface HTMLPreElement extends HTMLElement {
       */
     width: number;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLPreElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLPreElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLPreElement: {
@@ -6154,7 +6148,7 @@ interface HTMLProgressElement extends HTMLElement {
       */
     value: number;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLProgressElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLProgressElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLProgressElement: {
@@ -6168,7 +6162,7 @@ interface HTMLQuoteElement extends HTMLElement {
       */
     cite: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLQuoteElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLQuoteElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLQuoteElement: {
@@ -6209,7 +6203,7 @@ interface HTMLScriptElement extends HTMLElement {
     type: string;
     integrity: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLScriptElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLScriptElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLScriptElement: {
@@ -6305,7 +6299,7 @@ interface HTMLSelectElement extends HTMLElement {
       */
     setCustomValidity(error: string): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSelectElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLSelectElement>, useCapture?: boolean): void;
     [name: string]: any;
 }
 
@@ -6331,7 +6325,7 @@ interface HTMLSourceElement extends HTMLElement {
      */
     type: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSourceElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLSourceElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLSourceElement: {
@@ -6341,7 +6335,7 @@ declare var HTMLSourceElement: {
 
 interface HTMLSpanElement extends HTMLElement {
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSpanElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLSpanElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLSpanElement: {
@@ -6360,7 +6354,7 @@ interface HTMLStyleElement extends HTMLElement, LinkStyle {
       */
     type: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLStyleElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLStyleElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLStyleElement: {
@@ -6378,7 +6372,7 @@ interface HTMLTableCaptionElement extends HTMLElement {
       */
     vAlign: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableCaptionElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTableCaptionElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTableCaptionElement: {
@@ -6433,7 +6427,7 @@ interface HTMLTableCellElement extends HTMLElement, HTMLTableAlignment {
       */
     width: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableCellElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTableCellElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTableCellElement: {
@@ -6455,7 +6449,7 @@ interface HTMLTableColElement extends HTMLElement, HTMLTableAlignment {
       */
     width: any;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableColElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTableColElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTableColElement: {
@@ -6465,7 +6459,7 @@ declare var HTMLTableColElement: {
 
 interface HTMLTableDataCellElement extends HTMLTableCellElement {
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableDataCellElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTableDataCellElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTableDataCellElement: {
@@ -6578,7 +6572,7 @@ interface HTMLTableElement extends HTMLElement {
       */
     insertRow(index?: number): HTMLTableRowElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTableElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTableElement: {
@@ -6592,7 +6586,7 @@ interface HTMLTableHeaderCellElement extends HTMLTableCellElement {
       */
     scope: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableHeaderCellElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTableHeaderCellElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTableHeaderCellElement: {
@@ -6633,7 +6627,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
       */
     insertCell(index?: number): HTMLTableDataCellElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableRowElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTableRowElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTableRowElement: {
@@ -6661,7 +6655,7 @@ interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment {
       */
     insertRow(index?: number): HTMLTableRowElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableSectionElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTableSectionElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTableSectionElement: {
@@ -6672,7 +6666,7 @@ declare var HTMLTableSectionElement: {
 interface HTMLTemplateElement extends HTMLElement {
     readonly content: DocumentFragment;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTemplateElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTemplateElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTemplateElement: {
@@ -6779,7 +6773,7 @@ interface HTMLTextAreaElement extends HTMLElement {
       */
     setSelectionRange(start: number, end: number): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTextAreaElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTextAreaElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTextAreaElement: {
@@ -6790,7 +6784,7 @@ declare var HTMLTextAreaElement: {
 interface HTMLTimeElement extends HTMLElement {
     dateTime: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTimeElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTimeElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTimeElement: {
@@ -6804,7 +6798,7 @@ interface HTMLTitleElement extends HTMLElement {
       */
     text: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTitleElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTitleElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTitleElement: {
@@ -6825,7 +6819,7 @@ interface HTMLTrackElement extends HTMLElement {
     readonly LOADING: number;
     readonly NONE: number;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTrackElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLTrackElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLTrackElement: {
@@ -6841,7 +6835,7 @@ interface HTMLUListElement extends HTMLElement {
     compact: boolean;
     type: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLUListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLUListElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLUListElement: {
@@ -6851,7 +6845,7 @@ declare var HTMLUListElement: {
 
 interface HTMLUnknownElement extends HTMLElement {
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLUnknownElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLUnknownElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLUnknownElement: {
@@ -6876,9 +6870,9 @@ interface HTMLVideoElement extends HTMLMediaElement {
     msStereo3DPackingMode: string;
     msStereo3DRenderMode: string;
     msZoom: boolean;
-    onMSVideoFormatChanged: (this: HTMLVideoElement, ev: Event) => any;
-    onMSVideoFrameStepCompleted: (this: HTMLVideoElement, ev: Event) => any;
-    onMSVideoOptimalLayoutChanged: (this: HTMLVideoElement, ev: Event) => any;
+    onMSVideoFormatChanged: (this: HTMLVideoElement, ev: Event<HTMLVideoElement>) => any;
+    onMSVideoFrameStepCompleted: (this: HTMLVideoElement, ev: Event<HTMLVideoElement>) => any;
+    onMSVideoOptimalLayoutChanged: (this: HTMLVideoElement, ev: Event<HTMLVideoElement>) => any;
     /**
       * Gets or sets a URL of an image to display, for example, like a movie poster. This can be a still frame from the video, or another image if no video data is available.
       */
@@ -6906,7 +6900,7 @@ interface HTMLVideoElement extends HTMLMediaElement {
     webkitExitFullScreen(): void;
     webkitExitFullscreen(): void;
     addEventListener<K extends keyof HTMLVideoElementEventMap>(type: K, listener: (this: HTMLVideoElement, ev: HTMLVideoElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<HTMLVideoElement>, useCapture?: boolean): void;
 }
 
 declare var HTMLVideoElement: {
@@ -6914,7 +6908,7 @@ declare var HTMLVideoElement: {
     new(): HTMLVideoElement;
 }
 
-interface HashChangeEvent extends Event {
+interface HashChangeEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly newURL: string | null;
     readonly oldURL: string | null;
 }
@@ -6995,8 +6989,8 @@ interface IDBDatabaseEventMap {
 interface IDBDatabase extends EventTarget {
     readonly name: string;
     readonly objectStoreNames: DOMStringList;
-    onabort: (this: IDBDatabase, ev: Event) => any;
-    onerror: (this: IDBDatabase, ev: Event) => any;
+    onabort: (this: IDBDatabase, ev: Event<IDBDatabase>) => any;
+    onerror: (this: IDBDatabase, ev: Event<IDBDatabase>) => any;
     version: number;
     onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
@@ -7005,7 +6999,7 @@ interface IDBDatabase extends EventTarget {
     transaction(storeNames: string | string[], mode?: string): IDBTransaction;
     addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
     addEventListener<K extends keyof IDBDatabaseEventMap>(type: K, listener: (this: IDBDatabase, ev: IDBDatabaseEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<IDBDatabase>, useCapture?: boolean): void;
 }
 
 declare var IDBDatabase: {
@@ -7087,10 +7081,10 @@ interface IDBOpenDBRequestEventMap extends IDBRequestEventMap {
 }
 
 interface IDBOpenDBRequest extends IDBRequest {
-    onblocked: (this: IDBOpenDBRequest, ev: Event) => any;
-    onupgradeneeded: (this: IDBOpenDBRequest, ev: IDBVersionChangeEvent) => any;
+    onblocked: (this: IDBOpenDBRequest, ev: Event<IDBOpenDBRequest>) => any;
+    onupgradeneeded: (this: IDBOpenDBRequest, ev: IDBVersionChangeEvent<IDBOpenDBRequest>) => any;
     addEventListener<K extends keyof IDBOpenDBRequestEventMap>(type: K, listener: (this: IDBOpenDBRequest, ev: IDBOpenDBRequestEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<IDBOpenDBRequest>, useCapture?: boolean): void;
 }
 
 declare var IDBOpenDBRequest: {
@@ -7105,14 +7099,14 @@ interface IDBRequestEventMap {
 
 interface IDBRequest extends EventTarget {
     readonly error: DOMError;
-    onerror: (this: IDBRequest, ev: Event) => any;
-    onsuccess: (this: IDBRequest, ev: Event) => any;
+    onerror: (this: IDBRequest, ev: Event<IDBRequest>) => any;
+    onsuccess: (this: IDBRequest, ev: Event<IDBRequest>) => any;
     readonly readyState: string;
     readonly result: any;
     source: IDBObjectStore | IDBIndex | IDBCursor;
     readonly transaction: IDBTransaction;
     addEventListener<K extends keyof IDBRequestEventMap>(type: K, listener: (this: IDBRequest, ev: IDBRequestEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<IDBRequest>, useCapture?: boolean): void;
 }
 
 declare var IDBRequest: {
@@ -7130,16 +7124,16 @@ interface IDBTransaction extends EventTarget {
     readonly db: IDBDatabase;
     readonly error: DOMError;
     readonly mode: string;
-    onabort: (this: IDBTransaction, ev: Event) => any;
-    oncomplete: (this: IDBTransaction, ev: Event) => any;
-    onerror: (this: IDBTransaction, ev: Event) => any;
+    onabort: (this: IDBTransaction, ev: Event<IDBTransaction>) => any;
+    oncomplete: (this: IDBTransaction, ev: Event<IDBTransaction>) => any;
+    onerror: (this: IDBTransaction, ev: Event<IDBTransaction>) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
     readonly READ_ONLY: string;
     readonly READ_WRITE: string;
     readonly VERSION_CHANGE: string;
     addEventListener<K extends keyof IDBTransactionEventMap>(type: K, listener: (this: IDBTransaction, ev: IDBTransactionEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<IDBTransaction>, useCapture?: boolean): void;
 }
 
 declare var IDBTransaction: {
@@ -7150,7 +7144,7 @@ declare var IDBTransaction: {
     readonly VERSION_CHANGE: string;
 }
 
-interface IDBVersionChangeEvent extends Event {
+interface IDBVersionChangeEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly newVersion: number | null;
     readonly oldVersion: number;
 }
@@ -7210,7 +7204,7 @@ declare var IntersectionObserverEntry: {
     new(intersectionObserverEntryInit: IntersectionObserverEntryInit): IntersectionObserverEntry;
 }
 
-interface KeyboardEvent extends UIEvent {
+interface KeyboardEvent<T extends EventTarget<T> = EventTarget> extends UIEvent<T> {
     readonly altKey: boolean;
     readonly char: string | null;
     readonly charCode: number;
@@ -7245,7 +7239,7 @@ declare var KeyboardEvent: {
     readonly DOM_KEY_LOCATION_STANDARD: number;
 }
 
-interface ListeningStateChangedEvent extends Event {
+interface ListeningStateChangedEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly label: string;
     readonly state: string;
 }
@@ -7276,7 +7270,7 @@ declare var Location: {
     new(): Location;
 }
 
-interface LongRunningScriptDetectedEvent extends Event {
+interface LongRunningScriptDetectedEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly executionTime: number;
     stopPageScriptExecution: boolean;
 }
@@ -7316,8 +7310,8 @@ interface MSAppAsyncOperationEventMap {
 
 interface MSAppAsyncOperation extends EventTarget {
     readonly error: DOMError;
-    oncomplete: (this: MSAppAsyncOperation, ev: Event) => any;
-    onerror: (this: MSAppAsyncOperation, ev: Event) => any;
+    oncomplete: (this: MSAppAsyncOperation, ev: Event<MSAppAsyncOperation>) => any;
+    onerror: (this: MSAppAsyncOperation, ev: Event<MSAppAsyncOperation>) => any;
     readonly readyState: number;
     readonly result: any;
     start(): void;
@@ -7325,7 +7319,7 @@ interface MSAppAsyncOperation extends EventTarget {
     readonly ERROR: number;
     readonly STARTED: number;
     addEventListener<K extends keyof MSAppAsyncOperationEventMap>(type: K, listener: (this: MSAppAsyncOperation, ev: MSAppAsyncOperationEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<MSAppAsyncOperation>, useCapture?: boolean): void;
 }
 
 declare var MSAppAsyncOperation: {
@@ -7409,7 +7403,7 @@ declare var MSGesture: {
     new(): MSGesture;
 }
 
-interface MSGestureEvent extends UIEvent {
+interface MSGestureEvent<T extends EventTarget<T> = EventTarget> extends UIEvent<T> {
     readonly clientX: number;
     readonly clientY: number;
     readonly expansion: number;
@@ -7481,7 +7475,7 @@ interface MSHTMLWebViewElement extends HTMLElement {
     refresh(): void;
     stop(): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: MSHTMLWebViewElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<MSHTMLWebViewElement>, useCapture?: boolean): void;
 }
 
 declare var MSHTMLWebViewElement: {
@@ -7498,16 +7492,16 @@ interface MSInputMethodContextEventMap {
 interface MSInputMethodContext extends EventTarget {
     readonly compositionEndOffset: number;
     readonly compositionStartOffset: number;
-    oncandidatewindowhide: (this: MSInputMethodContext, ev: Event) => any;
-    oncandidatewindowshow: (this: MSInputMethodContext, ev: Event) => any;
-    oncandidatewindowupdate: (this: MSInputMethodContext, ev: Event) => any;
+    oncandidatewindowhide: (this: MSInputMethodContext, ev: Event<MSInputMethodContext>) => any;
+    oncandidatewindowshow: (this: MSInputMethodContext, ev: Event<MSInputMethodContext>) => any;
+    oncandidatewindowupdate: (this: MSInputMethodContext, ev: Event<MSInputMethodContext>) => any;
     readonly target: HTMLElement;
     getCandidateWindowClientRect(): ClientRect;
     getCompositionAlternatives(): string[];
     hasComposition(): boolean;
     isCandidateWindowVisible(): boolean;
     addEventListener<K extends keyof MSInputMethodContextEventMap>(type: K, listener: (this: MSInputMethodContext, ev: MSInputMethodContextEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<MSInputMethodContext>, useCapture?: boolean): void;
 }
 
 declare var MSInputMethodContext: {
@@ -7515,7 +7509,7 @@ declare var MSInputMethodContext: {
     new(): MSInputMethodContext;
 }
 
-interface MSManipulationEvent extends UIEvent {
+interface MSManipulationEvent<T extends EventTarget<T> = EventTarget> extends UIEvent<T> {
     readonly currentState: number;
     readonly inertiaDestinationX: number;
     readonly inertiaDestinationY: number;
@@ -7566,7 +7560,7 @@ declare var MSMediaKeyError: {
     readonly MS_MEDIA_KEYERR_UNKNOWN: number;
 }
 
-interface MSMediaKeyMessageEvent extends Event {
+interface MSMediaKeyMessageEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly destinationURL: string | null;
     readonly message: Uint8Array;
 }
@@ -7576,7 +7570,7 @@ declare var MSMediaKeyMessageEvent: {
     new(): MSMediaKeyMessageEvent;
 }
 
-interface MSMediaKeyNeededEvent extends Event {
+interface MSMediaKeyNeededEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly initData: Uint8Array | null;
 }
 
@@ -7610,7 +7604,7 @@ declare var MSMediaKeys: {
     isTypeSupportedWithFeatures(keySystem: string, type?: string): string;
 }
 
-interface MSPointerEvent extends MouseEvent {
+interface MSPointerEvent<T extends EventTarget<T> = EventTarget> extends MouseEvent<T> {
     readonly currentPoint: any;
     readonly height: number;
     readonly hwTimestamp: number;
@@ -7644,7 +7638,7 @@ declare var MSRangeCollection: {
     new(): MSRangeCollection;
 }
 
-interface MSSiteModeEvent extends Event {
+interface MSSiteModeEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly actionURL: string;
     readonly buttonID: number;
 }
@@ -7665,7 +7659,7 @@ declare var MSStream: {
     new(): MSStream;
 }
 
-interface MSStreamReader extends EventTarget, MSBaseReader {
+interface MSStreamReader extends EventTarget, MSBaseReader<MSStreamReader> {
     readonly error: DOMError;
     readAsArrayBuffer(stream: MSStream, size?: number): void;
     readAsBinaryString(stream: MSStream, size?: number): void;
@@ -7673,7 +7667,7 @@ interface MSStreamReader extends EventTarget, MSBaseReader {
     readAsDataURL(stream: MSStream, size?: number): void;
     readAsText(stream: MSStream, encoding?: string, size?: number): void;
     addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSStreamReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<MSStreamReader>, useCapture?: boolean): void;
 }
 
 declare var MSStreamReader: {
@@ -7688,8 +7682,8 @@ interface MSWebViewAsyncOperationEventMap {
 
 interface MSWebViewAsyncOperation extends EventTarget {
     readonly error: DOMError;
-    oncomplete: (this: MSWebViewAsyncOperation, ev: Event) => any;
-    onerror: (this: MSWebViewAsyncOperation, ev: Event) => any;
+    oncomplete: (this: MSWebViewAsyncOperation, ev: Event<MSWebViewAsyncOperation>) => any;
+    onerror: (this: MSWebViewAsyncOperation, ev: Event<MSWebViewAsyncOperation>) => any;
     readonly readyState: number;
     readonly result: any;
     readonly target: MSHTMLWebViewElement;
@@ -7702,7 +7696,7 @@ interface MSWebViewAsyncOperation extends EventTarget {
     readonly TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
     readonly TYPE_INVOKE_SCRIPT: number;
     addEventListener<K extends keyof MSWebViewAsyncOperationEventMap>(type: K, listener: (this: MSWebViewAsyncOperation, ev: MSWebViewAsyncOperationEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<MSWebViewAsyncOperation>, useCapture?: boolean): void;
 }
 
 declare var MSWebViewAsyncOperation: {
@@ -7743,12 +7737,12 @@ interface MediaDevicesEventMap {
 }
 
 interface MediaDevices extends EventTarget {
-    ondevicechange: (this: MediaDevices, ev: Event) => any;
+    ondevicechange: (this: MediaDevices, ev: Event<MediaDevices>) => any;
     enumerateDevices(): any;
     getSupportedConstraints(): MediaTrackSupportedConstraints;
     getUserMedia(constraints: MediaStreamConstraints): Promise<MediaStream>;
     addEventListener<K extends keyof MediaDevicesEventMap>(type: K, listener: (this: MediaDevices, ev: MediaDevicesEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<MediaDevices>, useCapture?: boolean): void;
 }
 
 declare var MediaDevices: {
@@ -7764,7 +7758,7 @@ declare var MediaElementAudioSourceNode: {
     new(): MediaElementAudioSourceNode;
 }
 
-interface MediaEncryptedEvent extends Event {
+interface MediaEncryptedEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly initData: ArrayBuffer | null;
     readonly initDataType: string;
 }
@@ -7794,7 +7788,7 @@ declare var MediaError: {
     readonly MS_MEDIA_ERR_ENCRYPTED: number;
 }
 
-interface MediaKeyMessageEvent extends Event {
+interface MediaKeyMessageEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly message: ArrayBuffer;
     readonly messageType: string;
 }
@@ -7907,10 +7901,10 @@ interface MediaStreamEventMap {
 interface MediaStream extends EventTarget {
     readonly active: boolean;
     readonly id: string;
-    onactive: (this: MediaStream, ev: Event) => any;
-    onaddtrack: (this: MediaStream, ev: MediaStreamTrackEvent) => any;
-    oninactive: (this: MediaStream, ev: Event) => any;
-    onremovetrack: (this: MediaStream, ev: MediaStreamTrackEvent) => any;
+    onactive: (this: MediaStream, ev: Event<MediaStream>) => any;
+    onaddtrack: (this: MediaStream, ev: MediaStreamTrackEvent<MediaStream>) => any;
+    oninactive: (this: MediaStream, ev: Event<MediaStream>) => any;
+    onremovetrack: (this: MediaStream, ev: MediaStreamTrackEvent<MediaStream>) => any;
     addTrack(track: MediaStreamTrack): void;
     clone(): MediaStream;
     getAudioTracks(): MediaStreamTrack[];
@@ -7920,7 +7914,7 @@ interface MediaStream extends EventTarget {
     removeTrack(track: MediaStreamTrack): void;
     stop(): void;
     addEventListener<K extends keyof MediaStreamEventMap>(type: K, listener: (this: MediaStream, ev: MediaStreamEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<MediaStream>, useCapture?: boolean): void;
 }
 
 declare var MediaStream: {
@@ -7947,7 +7941,7 @@ declare var MediaStreamError: {
     new(): MediaStreamError;
 }
 
-interface MediaStreamErrorEvent extends Event {
+interface MediaStreamErrorEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly error: MediaStreamError | null;
 }
 
@@ -7956,7 +7950,7 @@ declare var MediaStreamErrorEvent: {
     new(typeArg: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent;
 }
 
-interface MediaStreamEvent extends Event {
+interface MediaStreamEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly stream: MediaStream | null;
 }
 
@@ -7978,10 +7972,10 @@ interface MediaStreamTrack extends EventTarget {
     readonly kind: string;
     readonly label: string;
     readonly muted: boolean;
-    onended: (this: MediaStreamTrack, ev: MediaStreamErrorEvent) => any;
-    onmute: (this: MediaStreamTrack, ev: Event) => any;
-    onoverconstrained: (this: MediaStreamTrack, ev: MediaStreamErrorEvent) => any;
-    onunmute: (this: MediaStreamTrack, ev: Event) => any;
+    onended: (this: MediaStreamTrack, ev: MediaStreamErrorEvent<MediaStreamTrack>) => any;
+    onmute: (this: MediaStreamTrack, ev: Event<MediaStreamTrack>) => any;
+    onoverconstrained: (this: MediaStreamTrack, ev: MediaStreamErrorEvent<MediaStreamTrack>) => any;
+    onunmute: (this: MediaStreamTrack, ev: Event<MediaStreamTrack>) => any;
     readonly readonly: boolean;
     readonly readyState: string;
     readonly remote: boolean;
@@ -7992,7 +7986,7 @@ interface MediaStreamTrack extends EventTarget {
     getSettings(): MediaTrackSettings;
     stop(): void;
     addEventListener<K extends keyof MediaStreamTrackEventMap>(type: K, listener: (this: MediaStreamTrack, ev: MediaStreamTrackEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<MediaStreamTrack>, useCapture?: boolean): void;
 }
 
 declare var MediaStreamTrack: {
@@ -8000,7 +7994,7 @@ declare var MediaStreamTrack: {
     new(): MediaStreamTrack;
 }
 
-interface MediaStreamTrackEvent extends Event {
+interface MediaStreamTrackEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly track: MediaStreamTrack;
 }
 
@@ -8019,7 +8013,7 @@ declare var MessageChannel: {
     new(): MessageChannel;
 }
 
-interface MessageEvent extends Event {
+interface MessageEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly data: any;
     readonly origin: string;
     readonly ports: any;
@@ -8037,12 +8031,12 @@ interface MessagePortEventMap {
 }
 
 interface MessagePort extends EventTarget {
-    onmessage: (this: MessagePort, ev: MessageEvent) => any;
+    onmessage: (this: MessagePort, ev: MessageEvent<MessagePort>) => any;
     close(): void;
     postMessage(message?: any, transfer?: any[]): void;
     start(): void;
     addEventListener<K extends keyof MessagePortEventMap>(type: K, listener: (this: MessagePort, ev: MessagePortEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<MessagePort>, useCapture?: boolean): void;
 }
 
 declare var MessagePort: {
@@ -8074,7 +8068,7 @@ declare var MimeTypeArray: {
     new(): MimeTypeArray;
 }
 
-interface MouseEvent extends UIEvent {
+interface MouseEvent<T extends EventTarget<T> = EventTarget> extends UIEvent<T> {
     readonly altKey: boolean;
     readonly button: number;
     readonly buttons: number;
@@ -8108,7 +8102,7 @@ declare var MouseEvent: {
     new(typeArg: string, eventInitDict?: MouseEventInit): MouseEvent;
 }
 
-interface MutationEvent extends Event {
+interface MutationEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly attrChange: number;
     readonly attrName: string;
     readonly newValue: string;
@@ -8173,7 +8167,7 @@ declare var NamedNodeMap: {
     new(): NamedNodeMap;
 }
 
-interface NavigationCompletedEvent extends NavigationEvent {
+interface NavigationCompletedEvent<T extends EventTarget<T> = EventTarget> extends NavigationEvent<T> {
     readonly isSuccess: boolean;
     readonly webErrorStatus: number;
 }
@@ -8183,7 +8177,7 @@ declare var NavigationCompletedEvent: {
     new(): NavigationCompletedEvent;
 }
 
-interface NavigationEvent extends Event {
+interface NavigationEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly uri: string;
 }
 
@@ -8192,7 +8186,7 @@ declare var NavigationEvent: {
     new(): NavigationEvent;
 }
 
-interface NavigationEventWithReferrer extends NavigationEvent {
+interface NavigationEventWithReferrer<T extends EventTarget<T> = EventTarget> extends NavigationEvent<T> {
     readonly referer: string;
 }
 
@@ -8364,16 +8358,16 @@ interface Notification extends EventTarget {
     readonly dir: string;
     readonly icon: string;
     readonly lang: string;
-    onclick: (this: Notification, ev: Event) => any;
-    onclose: (this: Notification, ev: Event) => any;
-    onerror: (this: Notification, ev: Event) => any;
-    onshow: (this: Notification, ev: Event) => any;
+    onclick: (this: Notification, ev: Event<Notification>) => any;
+    onclose: (this: Notification, ev: Event<Notification>) => any;
+    onerror: (this: Notification, ev: Event<Notification>) => any;
+    onshow: (this: Notification, ev: Event<Notification>) => any;
     readonly permission: string;
     readonly tag: string;
     readonly title: string;
     close(): void;
     addEventListener<K extends keyof NotificationEventMap>(type: K, listener: (this: Notification, ev: NotificationEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<Notification>, useCapture?: boolean): void;
 }
 
 declare var Notification: {
@@ -8434,7 +8428,7 @@ declare var OES_texture_half_float_linear: {
     new(): OES_texture_half_float_linear;
 }
 
-interface OfflineAudioCompletionEvent extends Event {
+interface OfflineAudioCompletionEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly renderedBuffer: AudioBuffer;
 }
 
@@ -8449,11 +8443,11 @@ interface OfflineAudioContextEventMap extends AudioContextEventMap {
 
 interface OfflineAudioContext extends AudioContextBase {
     readonly length: number;
-    oncomplete: (this: OfflineAudioContext, ev: OfflineAudioCompletionEvent) => any;
+    oncomplete: (this: OfflineAudioContext, ev: OfflineAudioCompletionEvent<OfflineAudioContext>) => any;
     startRendering(): Promise<AudioBuffer>;
     suspend(suspendTime: number): Promise<void>;
     addEventListener<K extends keyof OfflineAudioContextEventMap>(type: K, listener: (this: OfflineAudioContext, ev: OfflineAudioContextEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<OfflineAudioContext>, useCapture?: boolean): void;
 }
 
 declare var OfflineAudioContext: {
@@ -8468,13 +8462,13 @@ interface OscillatorNodeEventMap {
 interface OscillatorNode extends AudioNode {
     readonly detune: AudioParam;
     readonly frequency: AudioParam;
-    onended: (this: OscillatorNode, ev: MediaStreamErrorEvent) => any;
+    onended: (this: OscillatorNode, ev: MediaStreamErrorEvent<OscillatorNode>) => any;
     type: string;
     setPeriodicWave(periodicWave: PeriodicWave): void;
     start(when?: number): void;
     stop(when?: number): void;
     addEventListener<K extends keyof OscillatorNodeEventMap>(type: K, listener: (this: OscillatorNode, ev: OscillatorNodeEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<OscillatorNode>, useCapture?: boolean): void;
 }
 
 declare var OscillatorNode: {
@@ -8482,7 +8476,7 @@ declare var OscillatorNode: {
     new(): OscillatorNode;
 }
 
-interface OverflowEvent extends UIEvent {
+interface OverflowEvent<T extends EventTarget<T> = EventTarget> extends UIEvent<T> {
     readonly horizontalOverflow: boolean;
     readonly orient: number;
     readonly verticalOverflow: boolean;
@@ -8499,7 +8493,7 @@ declare var OverflowEvent: {
     readonly VERTICAL: number;
 }
 
-interface PageTransitionEvent extends Event {
+interface PageTransitionEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly persisted: boolean;
 }
 
@@ -8561,15 +8555,15 @@ interface PaymentRequestEventMap {
 }
 
 interface PaymentRequest extends EventTarget {
-    onshippingaddresschange: (this: PaymentRequest, ev: Event) => any;
-    onshippingoptionchange: (this: PaymentRequest, ev: Event) => any;
+    onshippingaddresschange: (this: PaymentRequest, ev: Event<PaymentRequest>) => any;
+    onshippingoptionchange: (this: PaymentRequest, ev: Event<PaymentRequest>) => any;
     readonly shippingAddress: PaymentAddress | null;
     readonly shippingOption: string | null;
     readonly shippingType: string | null;
     abort(): Promise<void>;
     show(): Promise<PaymentResponse>;
     addEventListener<K extends keyof PaymentRequestEventMap>(type: K, listener: (this: PaymentRequest, ev: PaymentRequestEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<PaymentRequest>, useCapture?: boolean): void;
 }
 
 declare var PaymentRequest: {
@@ -8577,7 +8571,7 @@ declare var PaymentRequest: {
     new(methodData: PaymentMethodData[], details: PaymentDetails, options?: PaymentOptions): PaymentRequest;
 }
 
-interface PaymentRequestUpdateEvent extends Event {
+interface PaymentRequestUpdateEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     updateWith(d: Promise<PaymentDetails>): void;
 }
 
@@ -8800,7 +8794,7 @@ declare var PermissionRequest: {
     new(): PermissionRequest;
 }
 
-interface PermissionRequestedEvent extends Event {
+interface PermissionRequestedEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly permissionRequest: PermissionRequest;
 }
 
@@ -8838,7 +8832,7 @@ declare var PluginArray: {
     new(): PluginArray;
 }
 
-interface PointerEvent extends MouseEvent {
+interface PointerEvent<T extends EventTarget<T> = EventTarget> extends MouseEvent<T> {
     readonly currentPoint: any;
     readonly height: number;
     readonly hwTimestamp: number;
@@ -8861,7 +8855,7 @@ declare var PointerEvent: {
     new(typeArg: string, eventInitDict?: PointerEventInit): PointerEvent;
 }
 
-interface PopStateEvent extends Event {
+interface PopStateEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly state: any;
     initPopStateEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, stateArg: any): void;
 }
@@ -8907,7 +8901,7 @@ declare var ProcessingInstruction: {
     new(): ProcessingInstruction;
 }
 
-interface ProgressEvent extends Event {
+interface ProgressEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly lengthComputable: boolean;
     readonly loaded: number;
     readonly total: number;
@@ -8953,7 +8947,7 @@ declare var PushSubscriptionOptions: {
     new(): PushSubscriptionOptions;
 }
 
-interface RTCDTMFToneChangeEvent extends Event {
+interface RTCDTMFToneChangeEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly tone: string;
 }
 
@@ -8968,8 +8962,8 @@ interface RTCDtlsTransportEventMap {
 }
 
 interface RTCDtlsTransport extends RTCStatsProvider {
-    ondtlsstatechange: ((this: RTCDtlsTransport, ev: RTCDtlsTransportStateChangedEvent) => any) | null;
-    onerror: ((this: RTCDtlsTransport, ev: Event) => any) | null;
+    ondtlsstatechange: ((this: RTCDtlsTransport, ev: RTCDtlsTransportStateChangedEvent<RTCDtlsTransport>) => any) | null;
+    onerror: ((this: RTCDtlsTransport, ev: Event<RTCDtlsTransport>) => any) | null;
     readonly state: string;
     readonly transport: RTCIceTransport;
     getLocalParameters(): RTCDtlsParameters;
@@ -8978,7 +8972,7 @@ interface RTCDtlsTransport extends RTCStatsProvider {
     start(remoteParameters: RTCDtlsParameters): void;
     stop(): void;
     addEventListener<K extends keyof RTCDtlsTransportEventMap>(type: K, listener: (this: RTCDtlsTransport, ev: RTCDtlsTransportEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<RTCDtlsTransport>, useCapture?: boolean): void;
 }
 
 declare var RTCDtlsTransport: {
@@ -8986,7 +8980,7 @@ declare var RTCDtlsTransport: {
     new(transport: RTCIceTransport): RTCDtlsTransport;
 }
 
-interface RTCDtlsTransportStateChangedEvent extends Event {
+interface RTCDtlsTransportStateChangedEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly state: string;
 }
 
@@ -9003,12 +8997,12 @@ interface RTCDtmfSender extends EventTarget {
     readonly canInsertDTMF: boolean;
     readonly duration: number;
     readonly interToneGap: number;
-    ontonechange: (this: RTCDtmfSender, ev: RTCDTMFToneChangeEvent) => any;
+    ontonechange: (this: RTCDtmfSender, ev: RTCDTMFToneChangeEvent<RTCDtmfSender>) => any;
     readonly sender: RTCRtpSender;
     readonly toneBuffer: string;
     insertDTMF(tones: string, duration?: number, interToneGap?: number): void;
     addEventListener<K extends keyof RTCDtmfSenderEventMap>(type: K, listener: (this: RTCDtmfSender, ev: RTCDtmfSenderEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<RTCDtmfSender>, useCapture?: boolean): void;
 }
 
 declare var RTCDtmfSender: {
@@ -9028,7 +9022,7 @@ declare var RTCIceCandidate: {
     new(candidateInitDict?: RTCIceCandidateInit): RTCIceCandidate;
 }
 
-interface RTCIceCandidatePairChangedEvent extends Event {
+interface RTCIceCandidatePairChangedEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly pair: RTCIceCandidatePair;
 }
 
@@ -9044,13 +9038,13 @@ interface RTCIceGathererEventMap {
 
 interface RTCIceGatherer extends RTCStatsProvider {
     readonly component: string;
-    onerror: ((this: RTCIceGatherer, ev: Event) => any) | null;
-    onlocalcandidate: ((this: RTCIceGatherer, ev: RTCIceGathererEvent) => any) | null;
+    onerror: ((this: RTCIceGatherer, ev: Event<RTCIceGatherer>) => any) | null;
+    onlocalcandidate: ((this: RTCIceGatherer, ev: RTCIceGathererEvent<RTCIceGatherer>) => any) | null;
     createAssociatedGatherer(): RTCIceGatherer;
     getLocalCandidates(): RTCIceCandidateDictionary[];
     getLocalParameters(): RTCIceParameters;
     addEventListener<K extends keyof RTCIceGathererEventMap>(type: K, listener: (this: RTCIceGatherer, ev: RTCIceGathererEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<RTCIceGatherer>, useCapture?: boolean): void;
 }
 
 declare var RTCIceGatherer: {
@@ -9058,7 +9052,7 @@ declare var RTCIceGatherer: {
     new(options: RTCIceGatherOptions): RTCIceGatherer;
 }
 
-interface RTCIceGathererEvent extends Event {
+interface RTCIceGathererEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly candidate: RTCIceCandidateDictionary | RTCIceCandidateComplete;
 }
 
@@ -9075,8 +9069,8 @@ interface RTCIceTransportEventMap {
 interface RTCIceTransport extends RTCStatsProvider {
     readonly component: string;
     readonly iceGatherer: RTCIceGatherer | null;
-    oncandidatepairchange: ((this: RTCIceTransport, ev: RTCIceCandidatePairChangedEvent) => any) | null;
-    onicestatechange: ((this: RTCIceTransport, ev: RTCIceTransportStateChangedEvent) => any) | null;
+    oncandidatepairchange: ((this: RTCIceTransport, ev: RTCIceCandidatePairChangedEvent<RTCIceTransport>) => any) | null;
+    onicestatechange: ((this: RTCIceTransport, ev: RTCIceTransportStateChangedEvent<RTCIceTransport>) => any) | null;
     readonly role: string;
     readonly state: string;
     addRemoteCandidate(remoteCandidate: RTCIceCandidateDictionary | RTCIceCandidateComplete): void;
@@ -9088,7 +9082,7 @@ interface RTCIceTransport extends RTCStatsProvider {
     start(gatherer: RTCIceGatherer, remoteParameters: RTCIceParameters, role?: string): void;
     stop(): void;
     addEventListener<K extends keyof RTCIceTransportEventMap>(type: K, listener: (this: RTCIceTransport, ev: RTCIceTransportEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<RTCIceTransport>, useCapture?: boolean): void;
 }
 
 declare var RTCIceTransport: {
@@ -9096,7 +9090,7 @@ declare var RTCIceTransport: {
     new(): RTCIceTransport;
 }
 
-interface RTCIceTransportStateChangedEvent extends Event {
+interface RTCIceTransportStateChangedEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly state: string;
 }
 
@@ -9120,13 +9114,13 @@ interface RTCPeerConnection extends EventTarget {
     readonly iceConnectionState: string;
     readonly iceGatheringState: string;
     readonly localDescription: RTCSessionDescription | null;
-    onaddstream: (this: RTCPeerConnection, ev: MediaStreamEvent) => any;
-    onicecandidate: (this: RTCPeerConnection, ev: RTCPeerConnectionIceEvent) => any;
-    oniceconnectionstatechange: (this: RTCPeerConnection, ev: Event) => any;
-    onicegatheringstatechange: (this: RTCPeerConnection, ev: Event) => any;
-    onnegotiationneeded: (this: RTCPeerConnection, ev: Event) => any;
-    onremovestream: (this: RTCPeerConnection, ev: MediaStreamEvent) => any;
-    onsignalingstatechange: (this: RTCPeerConnection, ev: Event) => any;
+    onaddstream: (this: RTCPeerConnection, ev: MediaStreamEvent<RTCPeerConnection>) => any;
+    onicecandidate: (this: RTCPeerConnection, ev: RTCPeerConnectionIceEvent<RTCPeerConnection>) => any;
+    oniceconnectionstatechange: (this: RTCPeerConnection, ev: Event<RTCPeerConnection>) => any;
+    onicegatheringstatechange: (this: RTCPeerConnection, ev: Event<RTCPeerConnection>) => any;
+    onnegotiationneeded: (this: RTCPeerConnection, ev: Event<RTCPeerConnection>) => any;
+    onremovestream: (this: RTCPeerConnection, ev: MediaStreamEvent<RTCPeerConnection>) => any;
+    onsignalingstatechange: (this: RTCPeerConnection, ev: Event<RTCPeerConnection>) => any;
     readonly remoteDescription: RTCSessionDescription | null;
     readonly signalingState: string;
     addIceCandidate(candidate: RTCIceCandidate, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): Promise<void>;
@@ -9143,7 +9137,7 @@ interface RTCPeerConnection extends EventTarget {
     setLocalDescription(description: RTCSessionDescription, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): Promise<void>;
     setRemoteDescription(description: RTCSessionDescription, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): Promise<void>;
     addEventListener<K extends keyof RTCPeerConnectionEventMap>(type: K, listener: (this: RTCPeerConnection, ev: RTCPeerConnectionEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<RTCPeerConnection>, useCapture?: boolean): void;
 }
 
 declare var RTCPeerConnection: {
@@ -9151,7 +9145,7 @@ declare var RTCPeerConnection: {
     new(configuration: RTCConfiguration): RTCPeerConnection;
 }
 
-interface RTCPeerConnectionIceEvent extends Event {
+interface RTCPeerConnectionIceEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly candidate: RTCIceCandidate;
 }
 
@@ -9165,7 +9159,7 @@ interface RTCRtpReceiverEventMap {
 }
 
 interface RTCRtpReceiver extends RTCStatsProvider {
-    onerror: ((this: RTCRtpReceiver, ev: Event) => any) | null;
+    onerror: ((this: RTCRtpReceiver, ev: Event<RTCRtpReceiver>) => any) | null;
     readonly rtcpTransport: RTCDtlsTransport;
     readonly track: MediaStreamTrack | null;
     readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
@@ -9175,7 +9169,7 @@ interface RTCRtpReceiver extends RTCStatsProvider {
     setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
     stop(): void;
     addEventListener<K extends keyof RTCRtpReceiverEventMap>(type: K, listener: (this: RTCRtpReceiver, ev: RTCRtpReceiverEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<RTCRtpReceiver>, useCapture?: boolean): void;
 }
 
 declare var RTCRtpReceiver: {
@@ -9190,8 +9184,8 @@ interface RTCRtpSenderEventMap {
 }
 
 interface RTCRtpSender extends RTCStatsProvider {
-    onerror: ((this: RTCRtpSender, ev: Event) => any) | null;
-    onssrcconflict: ((this: RTCRtpSender, ev: RTCSsrcConflictEvent) => any) | null;
+    onerror: ((this: RTCRtpSender, ev: Event<RTCRtpSender>) => any) | null;
+    onssrcconflict: ((this: RTCRtpSender, ev: RTCSsrcConflictEvent<RTCRtpSender>) => any) | null;
     readonly rtcpTransport: RTCDtlsTransport;
     readonly track: MediaStreamTrack;
     readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
@@ -9200,7 +9194,7 @@ interface RTCRtpSender extends RTCStatsProvider {
     setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
     stop(): void;
     addEventListener<K extends keyof RTCRtpSenderEventMap>(type: K, listener: (this: RTCRtpSender, ev: RTCRtpSenderEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<RTCRtpSender>, useCapture?: boolean): void;
 }
 
 declare var RTCRtpSender: {
@@ -9225,10 +9219,10 @@ interface RTCSrtpSdesTransportEventMap {
 }
 
 interface RTCSrtpSdesTransport extends EventTarget {
-    onerror: ((this: RTCSrtpSdesTransport, ev: Event) => any) | null;
+    onerror: ((this: RTCSrtpSdesTransport, ev: Event<RTCSrtpSdesTransport>) => any) | null;
     readonly transport: RTCIceTransport;
     addEventListener<K extends keyof RTCSrtpSdesTransportEventMap>(type: K, listener: (this: RTCSrtpSdesTransport, ev: RTCSrtpSdesTransportEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<RTCSrtpSdesTransport>, useCapture?: boolean): void;
 }
 
 declare var RTCSrtpSdesTransport: {
@@ -9237,7 +9231,7 @@ declare var RTCSrtpSdesTransport: {
     getLocalParameters(): RTCSrtpSdesParameters[];
 }
 
-interface RTCSsrcConflictEvent extends Event {
+interface RTCSsrcConflictEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly ssrc: number;
 }
 
@@ -9363,7 +9357,7 @@ declare var Response: {
 interface SVGAElement extends SVGGraphicsElement, SVGURIReference {
     readonly target: SVGAnimatedString;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGAElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGAElement>, useCapture?: boolean): void;
 }
 
 declare var SVGAElement: {
@@ -9520,7 +9514,7 @@ interface SVGCircleElement extends SVGGraphicsElement {
     readonly cy: SVGAnimatedLength;
     readonly r: SVGAnimatedLength;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGCircleElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGCircleElement>, useCapture?: boolean): void;
 }
 
 declare var SVGCircleElement: {
@@ -9531,7 +9525,7 @@ declare var SVGCircleElement: {
 interface SVGClipPathElement extends SVGGraphicsElement, SVGUnitTypes {
     readonly clipPathUnits: SVGAnimatedEnumeration;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGClipPathElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGClipPathElement>, useCapture?: boolean): void;
 }
 
 declare var SVGClipPathElement: {
@@ -9554,7 +9548,7 @@ interface SVGComponentTransferFunctionElement extends SVGElement {
     readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
     readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGComponentTransferFunctionElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGComponentTransferFunctionElement>, useCapture?: boolean): void;
 }
 
 declare var SVGComponentTransferFunctionElement: {
@@ -9570,7 +9564,7 @@ declare var SVGComponentTransferFunctionElement: {
 
 interface SVGDefsElement extends SVGGraphicsElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGDefsElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGDefsElement>, useCapture?: boolean): void;
 }
 
 declare var SVGDefsElement: {
@@ -9580,7 +9574,7 @@ declare var SVGDefsElement: {
 
 interface SVGDescElement extends SVGElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGDescElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGDescElement>, useCapture?: boolean): void;
 }
 
 declare var SVGDescElement: {
@@ -9603,22 +9597,22 @@ interface SVGElementEventMap extends ElementEventMap {
 
 interface SVGElement extends Element {
     className: any;
-    onclick: (this: SVGElement, ev: MouseEvent) => any;
-    ondblclick: (this: SVGElement, ev: MouseEvent) => any;
-    onfocusin: (this: SVGElement, ev: FocusEvent) => any;
-    onfocusout: (this: SVGElement, ev: FocusEvent) => any;
-    onload: (this: SVGElement, ev: Event) => any;
-    onmousedown: (this: SVGElement, ev: MouseEvent) => any;
-    onmousemove: (this: SVGElement, ev: MouseEvent) => any;
-    onmouseout: (this: SVGElement, ev: MouseEvent) => any;
-    onmouseover: (this: SVGElement, ev: MouseEvent) => any;
-    onmouseup: (this: SVGElement, ev: MouseEvent) => any;
+    onclick: (this: SVGElement, ev: MouseEvent<SVGElement>) => any;
+    ondblclick: (this: SVGElement, ev: MouseEvent<SVGElement>) => any;
+    onfocusin: (this: SVGElement, ev: FocusEvent<SVGElement>) => any;
+    onfocusout: (this: SVGElement, ev: FocusEvent<SVGElement>) => any;
+    onload: (this: SVGElement, ev: Event<SVGElement>) => any;
+    onmousedown: (this: SVGElement, ev: MouseEvent<SVGElement>) => any;
+    onmousemove: (this: SVGElement, ev: MouseEvent<SVGElement>) => any;
+    onmouseout: (this: SVGElement, ev: MouseEvent<SVGElement>) => any;
+    onmouseover: (this: SVGElement, ev: MouseEvent<SVGElement>) => any;
+    onmouseup: (this: SVGElement, ev: MouseEvent<SVGElement>) => any;
     readonly ownerSVGElement: SVGSVGElement;
     readonly style: CSSStyleDeclaration;
     readonly viewportElement: SVGElement;
     xmlbase: string;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGElement>, useCapture?: boolean): void;
 }
 
 declare var SVGElement: {
@@ -9658,7 +9652,7 @@ interface SVGEllipseElement extends SVGGraphicsElement {
     readonly rx: SVGAnimatedLength;
     readonly ry: SVGAnimatedLength;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGEllipseElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGEllipseElement>, useCapture?: boolean): void;
 }
 
 declare var SVGEllipseElement: {
@@ -9688,7 +9682,7 @@ interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttrib
     readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
     readonly SVG_FEBLEND_MODE_UNKNOWN: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEBlendElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEBlendElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEBlendElement: {
@@ -9723,7 +9717,7 @@ interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandard
     readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
     readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEColorMatrixElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEColorMatrixElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEColorMatrixElement: {
@@ -9739,7 +9733,7 @@ declare var SVGFEColorMatrixElement: {
 interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEComponentTransferElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEComponentTransferElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEComponentTransferElement: {
@@ -9763,7 +9757,7 @@ interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAt
     readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
     readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFECompositeElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFECompositeElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFECompositeElement: {
@@ -9796,7 +9790,7 @@ interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStand
     readonly SVG_EDGEMODE_UNKNOWN: number;
     readonly SVG_EDGEMODE_WRAP: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEConvolveMatrixElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEConvolveMatrixElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEConvolveMatrixElement: {
@@ -9815,7 +9809,7 @@ interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStan
     readonly kernelUnitLengthY: SVGAnimatedNumber;
     readonly surfaceScale: SVGAnimatedNumber;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDiffuseLightingElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEDiffuseLightingElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEDiffuseLightingElement: {
@@ -9835,7 +9829,7 @@ interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStan
     readonly SVG_CHANNEL_R: number;
     readonly SVG_CHANNEL_UNKNOWN: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDisplacementMapElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEDisplacementMapElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEDisplacementMapElement: {
@@ -9852,7 +9846,7 @@ interface SVGFEDistantLightElement extends SVGElement {
     readonly azimuth: SVGAnimatedNumber;
     readonly elevation: SVGAnimatedNumber;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDistantLightElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEDistantLightElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEDistantLightElement: {
@@ -9862,7 +9856,7 @@ declare var SVGFEDistantLightElement: {
 
 interface SVGFEFloodElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFloodElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEFloodElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEFloodElement: {
@@ -9872,7 +9866,7 @@ declare var SVGFEFloodElement: {
 
 interface SVGFEFuncAElement extends SVGComponentTransferFunctionElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncAElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEFuncAElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEFuncAElement: {
@@ -9882,7 +9876,7 @@ declare var SVGFEFuncAElement: {
 
 interface SVGFEFuncBElement extends SVGComponentTransferFunctionElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncBElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEFuncBElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEFuncBElement: {
@@ -9892,7 +9886,7 @@ declare var SVGFEFuncBElement: {
 
 interface SVGFEFuncGElement extends SVGComponentTransferFunctionElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEFuncGElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEFuncGElement: {
@@ -9902,7 +9896,7 @@ declare var SVGFEFuncGElement: {
 
 interface SVGFEFuncRElement extends SVGComponentTransferFunctionElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncRElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEFuncRElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEFuncRElement: {
@@ -9916,7 +9910,7 @@ interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandar
     readonly stdDeviationY: SVGAnimatedNumber;
     setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEGaussianBlurElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEGaussianBlurElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEGaussianBlurElement: {
@@ -9927,7 +9921,7 @@ declare var SVGFEGaussianBlurElement: {
 interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGURIReference {
     readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEImageElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEImageElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEImageElement: {
@@ -9937,7 +9931,7 @@ declare var SVGFEImageElement: {
 
 interface SVGFEMergeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMergeElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEMergeElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEMergeElement: {
@@ -9948,7 +9942,7 @@ declare var SVGFEMergeElement: {
 interface SVGFEMergeNodeElement extends SVGElement {
     readonly in1: SVGAnimatedString;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMergeNodeElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEMergeNodeElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEMergeNodeElement: {
@@ -9965,7 +9959,7 @@ interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardA
     readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
     readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMorphologyElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEMorphologyElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEMorphologyElement: {
@@ -9981,7 +9975,7 @@ interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttri
     readonly dy: SVGAnimatedNumber;
     readonly in1: SVGAnimatedString;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEOffsetElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEOffsetElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEOffsetElement: {
@@ -9994,7 +9988,7 @@ interface SVGFEPointLightElement extends SVGElement {
     readonly y: SVGAnimatedNumber;
     readonly z: SVGAnimatedNumber;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEPointLightElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFEPointLightElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFEPointLightElement: {
@@ -10010,7 +10004,7 @@ interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveSta
     readonly specularExponent: SVGAnimatedNumber;
     readonly surfaceScale: SVGAnimatedNumber;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFESpecularLightingElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFESpecularLightingElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFESpecularLightingElement: {
@@ -10028,7 +10022,7 @@ interface SVGFESpotLightElement extends SVGElement {
     readonly y: SVGAnimatedNumber;
     readonly z: SVGAnimatedNumber;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFESpotLightElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFESpotLightElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFESpotLightElement: {
@@ -10039,7 +10033,7 @@ declare var SVGFESpotLightElement: {
 interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFETileElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFETileElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFETileElement: {
@@ -10061,7 +10055,7 @@ interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardA
     readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
     readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFETurbulenceElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFETurbulenceElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFETurbulenceElement: {
@@ -10086,7 +10080,7 @@ interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGURIReference {
     readonly y: SVGAnimatedLength;
     setFilterRes(filterResX: number, filterResY: number): void;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFilterElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGFilterElement>, useCapture?: boolean): void;
 }
 
 declare var SVGFilterElement: {
@@ -10100,7 +10094,7 @@ interface SVGForeignObjectElement extends SVGGraphicsElement {
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGForeignObjectElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGForeignObjectElement>, useCapture?: boolean): void;
 }
 
 declare var SVGForeignObjectElement: {
@@ -10110,7 +10104,7 @@ declare var SVGForeignObjectElement: {
 
 interface SVGGElement extends SVGGraphicsElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGGElement>, useCapture?: boolean): void;
 }
 
 declare var SVGGElement: {
@@ -10127,7 +10121,7 @@ interface SVGGradientElement extends SVGElement, SVGUnitTypes, SVGURIReference {
     readonly SVG_SPREADMETHOD_REPEAT: number;
     readonly SVG_SPREADMETHOD_UNKNOWN: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGGradientElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGGradientElement>, useCapture?: boolean): void;
 }
 
 declare var SVGGradientElement: {
@@ -10148,7 +10142,7 @@ interface SVGGraphicsElement extends SVGElement, SVGTests {
     getScreenCTM(): SVGMatrix;
     getTransformToElement(element: SVGElement): SVGMatrix;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGGraphicsElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGGraphicsElement>, useCapture?: boolean): void;
 }
 
 declare var SVGGraphicsElement: {
@@ -10163,7 +10157,7 @@ interface SVGImageElement extends SVGGraphicsElement, SVGURIReference {
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGImageElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGImageElement>, useCapture?: boolean): void;
 }
 
 declare var SVGImageElement: {
@@ -10229,7 +10223,7 @@ interface SVGLineElement extends SVGGraphicsElement {
     readonly y1: SVGAnimatedLength;
     readonly y2: SVGAnimatedLength;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGLineElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGLineElement>, useCapture?: boolean): void;
 }
 
 declare var SVGLineElement: {
@@ -10243,7 +10237,7 @@ interface SVGLinearGradientElement extends SVGGradientElement {
     readonly y1: SVGAnimatedLength;
     readonly y2: SVGAnimatedLength;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGLinearGradientElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGLinearGradientElement>, useCapture?: boolean): void;
 }
 
 declare var SVGLinearGradientElement: {
@@ -10268,7 +10262,7 @@ interface SVGMarkerElement extends SVGElement, SVGFitToViewBox {
     readonly SVG_MARKER_ORIENT_AUTO: number;
     readonly SVG_MARKER_ORIENT_UNKNOWN: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGMarkerElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGMarkerElement>, useCapture?: boolean): void;
 }
 
 declare var SVGMarkerElement: {
@@ -10290,7 +10284,7 @@ interface SVGMaskElement extends SVGElement, SVGTests, SVGUnitTypes {
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGMaskElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGMaskElement>, useCapture?: boolean): void;
 }
 
 declare var SVGMaskElement: {
@@ -10325,7 +10319,7 @@ declare var SVGMatrix: {
 
 interface SVGMetadataElement extends SVGElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGMetadataElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGMetadataElement>, useCapture?: boolean): void;
 }
 
 declare var SVGMetadataElement: {
@@ -10383,7 +10377,7 @@ interface SVGPathElement extends SVGGraphicsElement {
     getPointAtLength(distance: number): SVGPoint;
     getTotalLength(): number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPathElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGPathElement>, useCapture?: boolean): void;
 }
 
 declare var SVGPathElement: {
@@ -10676,7 +10670,7 @@ interface SVGPatternElement extends SVGElement, SVGTests, SVGUnitTypes, SVGFitTo
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPatternElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGPatternElement>, useCapture?: boolean): void;
 }
 
 declare var SVGPatternElement: {
@@ -10713,7 +10707,7 @@ declare var SVGPointList: {
 
 interface SVGPolygonElement extends SVGGraphicsElement, SVGAnimatedPoints {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolygonElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGPolygonElement>, useCapture?: boolean): void;
 }
 
 declare var SVGPolygonElement: {
@@ -10723,7 +10717,7 @@ declare var SVGPolygonElement: {
 
 interface SVGPolylineElement extends SVGGraphicsElement, SVGAnimatedPoints {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolylineElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGPolylineElement>, useCapture?: boolean): void;
 }
 
 declare var SVGPolylineElement: {
@@ -10776,7 +10770,7 @@ interface SVGRadialGradientElement extends SVGGradientElement {
     readonly fy: SVGAnimatedLength;
     readonly r: SVGAnimatedLength;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGRadialGradientElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGRadialGradientElement>, useCapture?: boolean): void;
 }
 
 declare var SVGRadialGradientElement: {
@@ -10804,7 +10798,7 @@ interface SVGRectElement extends SVGGraphicsElement {
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGRectElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGRectElement>, useCapture?: boolean): void;
 }
 
 declare var SVGRectElement: {
@@ -10827,12 +10821,12 @@ interface SVGSVGElement extends SVGGraphicsElement, DocumentEvent, SVGFitToViewB
     currentScale: number;
     readonly currentTranslate: SVGPoint;
     readonly height: SVGAnimatedLength;
-    onabort: (this: SVGSVGElement, ev: Event) => any;
-    onerror: (this: SVGSVGElement, ev: Event) => any;
-    onresize: (this: SVGSVGElement, ev: UIEvent) => any;
-    onscroll: (this: SVGSVGElement, ev: UIEvent) => any;
-    onunload: (this: SVGSVGElement, ev: Event) => any;
-    onzoom: (this: SVGSVGElement, ev: SVGZoomEvent) => any;
+    onabort: (this: SVGSVGElement, ev: Event<SVGSVGElement>) => any;
+    onerror: (this: SVGSVGElement, ev: Event<SVGSVGElement>) => any;
+    onresize: (this: SVGSVGElement, ev: UIEvent<SVGSVGElement>) => any;
+    onscroll: (this: SVGSVGElement, ev: UIEvent<SVGSVGElement>) => any;
+    onunload: (this: SVGSVGElement, ev: Event<SVGSVGElement>) => any;
+    onzoom: (this: SVGSVGElement, ev: SVGZoomEvent<SVGSVGElement>) => any;
     readonly pixelUnitToMillimeterX: number;
     readonly pixelUnitToMillimeterY: number;
     readonly screenPixelToMillimeterX: number;
@@ -10865,7 +10859,7 @@ interface SVGSVGElement extends SVGGraphicsElement, DocumentEvent, SVGFitToViewB
     unsuspendRedraw(suspendHandleID: number): void;
     unsuspendRedrawAll(): void;
     addEventListener<K extends keyof SVGSVGElementEventMap>(type: K, listener: (this: SVGSVGElement, ev: SVGSVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGSVGElement>, useCapture?: boolean): void;
 }
 
 declare var SVGSVGElement: {
@@ -10876,7 +10870,7 @@ declare var SVGSVGElement: {
 interface SVGScriptElement extends SVGElement, SVGURIReference {
     type: string;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGScriptElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGScriptElement>, useCapture?: boolean): void;
 }
 
 declare var SVGScriptElement: {
@@ -10887,7 +10881,7 @@ declare var SVGScriptElement: {
 interface SVGStopElement extends SVGElement {
     readonly offset: SVGAnimatedNumber;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGStopElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGStopElement>, useCapture?: boolean): void;
 }
 
 declare var SVGStopElement: {
@@ -10917,7 +10911,7 @@ interface SVGStyleElement extends SVGElement {
     title: string;
     type: string;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGStyleElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGStyleElement>, useCapture?: boolean): void;
 }
 
 declare var SVGStyleElement: {
@@ -10927,7 +10921,7 @@ declare var SVGStyleElement: {
 
 interface SVGSwitchElement extends SVGGraphicsElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGSwitchElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGSwitchElement>, useCapture?: boolean): void;
 }
 
 declare var SVGSwitchElement: {
@@ -10937,7 +10931,7 @@ declare var SVGSwitchElement: {
 
 interface SVGSymbolElement extends SVGElement, SVGFitToViewBox {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGSymbolElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGSymbolElement>, useCapture?: boolean): void;
 }
 
 declare var SVGSymbolElement: {
@@ -10947,7 +10941,7 @@ declare var SVGSymbolElement: {
 
 interface SVGTSpanElement extends SVGTextPositioningElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTSpanElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGTSpanElement>, useCapture?: boolean): void;
 }
 
 declare var SVGTSpanElement: {
@@ -10971,7 +10965,7 @@ interface SVGTextContentElement extends SVGGraphicsElement {
     readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
     readonly LENGTHADJUST_UNKNOWN: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextContentElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGTextContentElement>, useCapture?: boolean): void;
 }
 
 declare var SVGTextContentElement: {
@@ -10984,7 +10978,7 @@ declare var SVGTextContentElement: {
 
 interface SVGTextElement extends SVGTextPositioningElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGTextElement>, useCapture?: boolean): void;
 }
 
 declare var SVGTextElement: {
@@ -11003,7 +10997,7 @@ interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference {
     readonly TEXTPATH_SPACINGTYPE_EXACT: number;
     readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextPathElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGTextPathElement>, useCapture?: boolean): void;
 }
 
 declare var SVGTextPathElement: {
@@ -11024,7 +11018,7 @@ interface SVGTextPositioningElement extends SVGTextContentElement {
     readonly x: SVGAnimatedLengthList;
     readonly y: SVGAnimatedLengthList;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextPositioningElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGTextPositioningElement>, useCapture?: boolean): void;
 }
 
 declare var SVGTextPositioningElement: {
@@ -11034,7 +11028,7 @@ declare var SVGTextPositioningElement: {
 
 interface SVGTitleElement extends SVGElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTitleElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGTitleElement>, useCapture?: boolean): void;
 }
 
 declare var SVGTitleElement: {
@@ -11106,7 +11100,7 @@ interface SVGUseElement extends SVGGraphicsElement, SVGURIReference {
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGUseElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGUseElement>, useCapture?: boolean): void;
 }
 
 declare var SVGUseElement: {
@@ -11117,7 +11111,7 @@ declare var SVGUseElement: {
 interface SVGViewElement extends SVGElement, SVGZoomAndPan, SVGFitToViewBox {
     readonly viewTarget: SVGStringList;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGViewElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SVGViewElement>, useCapture?: boolean): void;
 }
 
 declare var SVGViewElement: {
@@ -11135,7 +11129,7 @@ declare var SVGZoomAndPan: {
     readonly SVG_ZOOMANDPAN_UNKNOWN: number;
 }
 
-interface SVGZoomEvent extends UIEvent {
+interface SVGZoomEvent<T extends EventTarget<T> = EventTarget> extends UIEvent<T> {
     readonly newScale: number;
     readonly newTranslate: SVGPoint;
     readonly previousScale: number;
@@ -11184,7 +11178,7 @@ interface Screen extends EventTarget {
     readonly logicalXDPI: number;
     readonly logicalYDPI: number;
     readonly msOrientation: string;
-    onmsorientationchange: (this: Screen, ev: Event) => any;
+    onmsorientationchange: (this: Screen, ev: Event<Screen>) => any;
     readonly pixelDepth: number;
     readonly systemXDPI: number;
     readonly systemYDPI: number;
@@ -11192,7 +11186,7 @@ interface Screen extends EventTarget {
     msLockOrientation(orientations: string | string[]): boolean;
     msUnlockOrientation(): void;
     addEventListener<K extends keyof ScreenEventMap>(type: K, listener: (this: Screen, ev: ScreenEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<Screen>, useCapture?: boolean): void;
 }
 
 declare var Screen: {
@@ -11200,7 +11194,7 @@ declare var Screen: {
     new(): Screen;
 }
 
-interface ScriptNotifyEvent extends Event {
+interface ScriptNotifyEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly callingUri: string;
     readonly value: string;
 }
@@ -11216,9 +11210,9 @@ interface ScriptProcessorNodeEventMap {
 
 interface ScriptProcessorNode extends AudioNode {
     readonly bufferSize: number;
-    onaudioprocess: (this: ScriptProcessorNode, ev: AudioProcessingEvent) => any;
+    onaudioprocess: (this: ScriptProcessorNode, ev: AudioProcessingEvent<ScriptProcessorNode>) => any;
     addEventListener<K extends keyof ScriptProcessorNodeEventMap>(type: K, listener: (this: ScriptProcessorNode, ev: ScriptProcessorNodeEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<ScriptProcessorNode>, useCapture?: boolean): void;
 }
 
 declare var ScriptProcessorNode: {
@@ -11264,13 +11258,13 @@ interface ServiceWorkerEventMap extends AbstractWorkerEventMap {
     "statechange": Event;
 }
 
-interface ServiceWorker extends EventTarget, AbstractWorker {
-    onstatechange: (this: ServiceWorker, ev: Event) => any;
+interface ServiceWorker extends EventTarget, AbstractWorker<ServiceWorker> {
+    onstatechange: (this: ServiceWorker, ev: Event<ServiceWorker>) => any;
     readonly scriptURL: USVString;
     readonly state: string;
     postMessage(message: any, transfer?: any[]): void;
     addEventListener<K extends keyof ServiceWorkerEventMap>(type: K, listener: (this: ServiceWorker, ev: ServiceWorkerEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<ServiceWorker>, useCapture?: boolean): void;
 }
 
 declare var ServiceWorker: {
@@ -11285,14 +11279,14 @@ interface ServiceWorkerContainerEventMap {
 
 interface ServiceWorkerContainer extends EventTarget {
     readonly controller: ServiceWorker | null;
-    oncontrollerchange: (this: ServiceWorkerContainer, ev: Event) => any;
-    onmessage: (this: ServiceWorkerContainer, ev: ServiceWorkerMessageEvent) => any;
+    oncontrollerchange: (this: ServiceWorkerContainer, ev: Event<ServiceWorkerContainer>) => any;
+    onmessage: (this: ServiceWorkerContainer, ev: ServiceWorkerMessageEvent<ServiceWorkerContainer>) => any;
     readonly ready: Promise<ServiceWorkerRegistration>;
     getRegistration(clientURL?: USVString): Promise<any>;
     getRegistrations(): any;
     register(scriptURL: USVString, options?: RegistrationOptions): Promise<ServiceWorkerRegistration>;
     addEventListener<K extends keyof ServiceWorkerContainerEventMap>(type: K, listener: (this: ServiceWorkerContainer, ev: ServiceWorkerContainerEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<ServiceWorkerContainer>, useCapture?: boolean): void;
 }
 
 declare var ServiceWorkerContainer: {
@@ -11300,7 +11294,7 @@ declare var ServiceWorkerContainer: {
     new(): ServiceWorkerContainer;
 }
 
-interface ServiceWorkerMessageEvent extends Event {
+interface ServiceWorkerMessageEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly data: any;
     readonly lastEventId: string;
     readonly origin: string;
@@ -11320,7 +11314,7 @@ interface ServiceWorkerRegistrationEventMap {
 interface ServiceWorkerRegistration extends EventTarget {
     readonly active: ServiceWorker | null;
     readonly installing: ServiceWorker | null;
-    onupdatefound: (this: ServiceWorkerRegistration, ev: Event) => any;
+    onupdatefound: (this: ServiceWorkerRegistration, ev: Event<ServiceWorkerRegistration>) => any;
     readonly pushManager: PushManager;
     readonly scope: USVString;
     readonly sync: SyncManager;
@@ -11330,7 +11324,7 @@ interface ServiceWorkerRegistration extends EventTarget {
     unregister(): Promise<boolean>;
     update(): Promise<void>;
     addEventListener<K extends keyof ServiceWorkerRegistrationEventMap>(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<ServiceWorkerRegistration>, useCapture?: boolean): void;
 }
 
 declare var ServiceWorkerRegistration: {
@@ -11374,7 +11368,7 @@ interface SpeechSynthesisEventMap {
 }
 
 interface SpeechSynthesis extends EventTarget {
-    onvoiceschanged: (this: SpeechSynthesis, ev: Event) => any;
+    onvoiceschanged: (this: SpeechSynthesis, ev: Event<SpeechSynthesis>) => any;
     readonly paused: boolean;
     readonly pending: boolean;
     readonly speaking: boolean;
@@ -11384,7 +11378,7 @@ interface SpeechSynthesis extends EventTarget {
     resume(): void;
     speak(utterance: SpeechSynthesisUtterance): void;
     addEventListener<K extends keyof SpeechSynthesisEventMap>(type: K, listener: (this: SpeechSynthesis, ev: SpeechSynthesisEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SpeechSynthesis>, useCapture?: boolean): void;
 }
 
 declare var SpeechSynthesis: {
@@ -11392,7 +11386,7 @@ declare var SpeechSynthesis: {
     new(): SpeechSynthesis;
 }
 
-interface SpeechSynthesisEvent extends Event {
+interface SpeechSynthesisEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly charIndex: number;
     readonly elapsedTime: number;
     readonly name: string;
@@ -11416,20 +11410,20 @@ interface SpeechSynthesisUtteranceEventMap {
 
 interface SpeechSynthesisUtterance extends EventTarget {
     lang: string;
-    onboundary: (this: SpeechSynthesisUtterance, ev: Event) => any;
-    onend: (this: SpeechSynthesisUtterance, ev: Event) => any;
-    onerror: (this: SpeechSynthesisUtterance, ev: Event) => any;
-    onmark: (this: SpeechSynthesisUtterance, ev: Event) => any;
-    onpause: (this: SpeechSynthesisUtterance, ev: Event) => any;
-    onresume: (this: SpeechSynthesisUtterance, ev: Event) => any;
-    onstart: (this: SpeechSynthesisUtterance, ev: Event) => any;
+    onboundary: (this: SpeechSynthesisUtterance, ev: Event<SpeechSynthesisUtterance>) => any;
+    onend: (this: SpeechSynthesisUtterance, ev: Event<SpeechSynthesisUtterance>) => any;
+    onerror: (this: SpeechSynthesisUtterance, ev: Event<SpeechSynthesisUtterance>) => any;
+    onmark: (this: SpeechSynthesisUtterance, ev: Event<SpeechSynthesisUtterance>) => any;
+    onpause: (this: SpeechSynthesisUtterance, ev: Event<SpeechSynthesisUtterance>) => any;
+    onresume: (this: SpeechSynthesisUtterance, ev: Event<SpeechSynthesisUtterance>) => any;
+    onstart: (this: SpeechSynthesisUtterance, ev: Event<SpeechSynthesisUtterance>) => any;
     pitch: number;
     rate: number;
     text: string;
     voice: SpeechSynthesisVoice;
     volume: number;
     addEventListener<K extends keyof SpeechSynthesisUtteranceEventMap>(type: K, listener: (this: SpeechSynthesisUtterance, ev: SpeechSynthesisUtteranceEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<SpeechSynthesisUtterance>, useCapture?: boolean): void;
 }
 
 declare var SpeechSynthesisUtterance: {
@@ -11475,7 +11469,7 @@ declare var Storage: {
     new(): Storage;
 }
 
-interface StorageEvent extends Event {
+interface StorageEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly url: string;
     key?: string;
     oldValue?: string;
@@ -11582,7 +11576,7 @@ declare var Text: {
     new(): Text;
 }
 
-interface TextEvent extends UIEvent {
+interface TextEvent<T extends EventTarget<T> = EventTarget> extends UIEvent<T> {
     readonly data: string;
     readonly inputMethod: number;
     readonly locale: string;
@@ -11637,9 +11631,9 @@ interface TextTrack extends EventTarget {
     readonly label: string;
     readonly language: string;
     mode: any;
-    oncuechange: (this: TextTrack, ev: Event) => any;
-    onerror: (this: TextTrack, ev: Event) => any;
-    onload: (this: TextTrack, ev: Event) => any;
+    oncuechange: (this: TextTrack, ev: Event<TextTrack>) => any;
+    onerror: (this: TextTrack, ev: Event<TextTrack>) => any;
+    onload: (this: TextTrack, ev: Event<TextTrack>) => any;
     readonly readyState: number;
     addCue(cue: TextTrackCue): void;
     removeCue(cue: TextTrackCue): void;
@@ -11651,7 +11645,7 @@ interface TextTrack extends EventTarget {
     readonly NONE: number;
     readonly SHOWING: number;
     addEventListener<K extends keyof TextTrackEventMap>(type: K, listener: (this: TextTrack, ev: TextTrackEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<TextTrack>, useCapture?: boolean): void;
 }
 
 declare var TextTrack: {
@@ -11674,15 +11668,15 @@ interface TextTrackCueEventMap {
 interface TextTrackCue extends EventTarget {
     endTime: number;
     id: string;
-    onenter: (this: TextTrackCue, ev: Event) => any;
-    onexit: (this: TextTrackCue, ev: Event) => any;
+    onenter: (this: TextTrackCue, ev: Event<TextTrackCue>) => any;
+    onexit: (this: TextTrackCue, ev: Event<TextTrackCue>) => any;
     pauseOnExit: boolean;
     startTime: number;
     text: string;
     readonly track: TextTrack;
     getCueAsHTML(): DocumentFragment;
     addEventListener<K extends keyof TextTrackCueEventMap>(type: K, listener: (this: TextTrackCue, ev: TextTrackCueEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<TextTrackCue>, useCapture?: boolean): void;
 }
 
 declare var TextTrackCue: {
@@ -11708,10 +11702,10 @@ interface TextTrackListEventMap {
 
 interface TextTrackList extends EventTarget {
     readonly length: number;
-    onaddtrack: ((this: TextTrackList, ev: TrackEvent) => any) | null;
+    onaddtrack: ((this: TextTrackList, ev: TrackEvent<TextTrackList>) => any) | null;
     item(index: number): TextTrack;
     addEventListener<K extends keyof TextTrackListEventMap>(type: K, listener: (this: TextTrackList, ev: TextTrackListEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<TextTrackList>, useCapture?: boolean): void;
     [index: number]: TextTrack;
 }
 
@@ -11747,7 +11741,7 @@ declare var Touch: {
     new(): Touch;
 }
 
-interface TouchEvent extends UIEvent {
+interface TouchEvent<T extends EventTarget<T> = EventTarget> extends UIEvent<T> {
     readonly altKey: boolean;
     readonly changedTouches: TouchList;
     readonly charCode: number;
@@ -11776,7 +11770,7 @@ declare var TouchList: {
     new(): TouchList;
 }
 
-interface TrackEvent extends Event {
+interface TrackEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly track: VideoTrack | AudioTrack | TextTrack | null;
 }
 
@@ -11785,7 +11779,7 @@ declare var TrackEvent: {
     new(typeArg: string, eventInitDict?: TrackEventInit): TrackEvent;
 }
 
-interface TransitionEvent extends Event {
+interface TransitionEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly elapsedTime: number;
     readonly propertyName: string;
     initTransitionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, propertyNameArg: string, elapsedTimeArg: number): void;
@@ -11816,7 +11810,7 @@ declare var TreeWalker: {
     new(): TreeWalker;
 }
 
-interface UIEvent extends Event {
+interface UIEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly detail: number;
     readonly view: Window;
     initUIEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number): void;
@@ -11850,7 +11844,7 @@ declare var URL: {
     revokeObjectURL(url: string): void;
 }
 
-interface UnviewableContentIdentifiedEvent extends NavigationEventWithReferrer {
+interface UnviewableContentIdentifiedEvent<T extends EventTarget<T> = EventTarget> extends NavigationEventWithReferrer<T> {
     readonly mediaType: string;
 }
 
@@ -11912,14 +11906,14 @@ interface VideoTrackListEventMap {
 
 interface VideoTrackList extends EventTarget {
     readonly length: number;
-    onaddtrack: (this: VideoTrackList, ev: TrackEvent) => any;
-    onchange: (this: VideoTrackList, ev: Event) => any;
-    onremovetrack: (this: VideoTrackList, ev: TrackEvent) => any;
+    onaddtrack: (this: VideoTrackList, ev: TrackEvent<VideoTrackList>) => any;
+    onchange: (this: VideoTrackList, ev: Event<VideoTrackList>) => any;
+    onremovetrack: (this: VideoTrackList, ev: TrackEvent<VideoTrackList>) => any;
     readonly selectedIndex: number;
     getTrackById(id: string): VideoTrack | null;
     item(index: number): VideoTrack;
     addEventListener<K extends keyof VideoTrackListEventMap>(type: K, listener: (this: VideoTrackList, ev: VideoTrackListEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<VideoTrackList>, useCapture?: boolean): void;
     [index: number]: VideoTrack;
 }
 
@@ -12017,7 +12011,7 @@ declare var WebGLBuffer: {
     new(): WebGLBuffer;
 }
 
-interface WebGLContextEvent extends Event {
+interface WebGLContextEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly statusMessage: string;
 }
 
@@ -12947,10 +12941,10 @@ interface WebSocket extends EventTarget {
     binaryType: string;
     readonly bufferedAmount: number;
     readonly extensions: string;
-    onclose: (this: WebSocket, ev: CloseEvent) => any;
-    onerror: (this: WebSocket, ev: Event) => any;
-    onmessage: (this: WebSocket, ev: MessageEvent) => any;
-    onopen: (this: WebSocket, ev: Event) => any;
+    onclose: (this: WebSocket, ev: CloseEvent<WebSocket>) => any;
+    onerror: (this: WebSocket, ev: Event<WebSocket>) => any;
+    onmessage: (this: WebSocket, ev: MessageEvent<WebSocket>) => any;
+    onopen: (this: WebSocket, ev: Event<WebSocket>) => any;
     readonly protocol: string;
     readonly readyState: number;
     readonly url: string;
@@ -12961,7 +12955,7 @@ interface WebSocket extends EventTarget {
     readonly CONNECTING: number;
     readonly OPEN: number;
     addEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<WebSocket>, useCapture?: boolean): void;
 }
 
 declare var WebSocket: {
@@ -12973,7 +12967,7 @@ declare var WebSocket: {
     readonly OPEN: number;
 }
 
-interface WheelEvent extends MouseEvent {
+interface WheelEvent<T extends EventTarget<T> = EventTarget> extends MouseEvent<T> {
     readonly deltaMode: number;
     readonly deltaX: number;
     readonly deltaY: number;
@@ -13085,7 +13079,7 @@ interface WindowEventMap extends GlobalEventHandlersEventMap {
     "waiting": Event;
 }
 
-interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64, GlobalFetch {
+interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers<Window>, IDBEnvironment, WindowBase64, GlobalFetch {
     readonly applicationCache: ApplicationCache;
     readonly caches: CacheStorage;
     readonly clientInformation: Navigator;
@@ -13112,97 +13106,97 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     name: string;
     readonly navigator: Navigator;
     offscreenBuffering: string | boolean;
-    onabort: (this: Window, ev: UIEvent) => any;
-    onafterprint: (this: Window, ev: Event) => any;
-    onbeforeprint: (this: Window, ev: Event) => any;
-    onbeforeunload: (this: Window, ev: BeforeUnloadEvent) => any;
-    onblur: (this: Window, ev: FocusEvent) => any;
-    oncanplay: (this: Window, ev: Event) => any;
-    oncanplaythrough: (this: Window, ev: Event) => any;
-    onchange: (this: Window, ev: Event) => any;
-    onclick: (this: Window, ev: MouseEvent) => any;
-    oncompassneedscalibration: (this: Window, ev: Event) => any;
-    oncontextmenu: (this: Window, ev: PointerEvent) => any;
-    ondblclick: (this: Window, ev: MouseEvent) => any;
-    ondevicelight: (this: Window, ev: DeviceLightEvent) => any;
-    ondevicemotion: (this: Window, ev: DeviceMotionEvent) => any;
-    ondeviceorientation: (this: Window, ev: DeviceOrientationEvent) => any;
-    ondrag: (this: Window, ev: DragEvent) => any;
-    ondragend: (this: Window, ev: DragEvent) => any;
-    ondragenter: (this: Window, ev: DragEvent) => any;
-    ondragleave: (this: Window, ev: DragEvent) => any;
-    ondragover: (this: Window, ev: DragEvent) => any;
-    ondragstart: (this: Window, ev: DragEvent) => any;
-    ondrop: (this: Window, ev: DragEvent) => any;
-    ondurationchange: (this: Window, ev: Event) => any;
-    onemptied: (this: Window, ev: Event) => any;
-    onended: (this: Window, ev: MediaStreamErrorEvent) => any;
+    onabort: (this: Window, ev: UIEvent<Window>) => any;
+    onafterprint: (this: Window, ev: Event<Window>) => any;
+    onbeforeprint: (this: Window, ev: Event<Window>) => any;
+    onbeforeunload: (this: Window, ev: BeforeUnloadEvent<Window>) => any;
+    onblur: (this: Window, ev: FocusEvent<Window>) => any;
+    oncanplay: (this: Window, ev: Event<Window>) => any;
+    oncanplaythrough: (this: Window, ev: Event<Window>) => any;
+    onchange: (this: Window, ev: Event<Window>) => any;
+    onclick: (this: Window, ev: MouseEvent<Window>) => any;
+    oncompassneedscalibration: (this: Window, ev: Event<Window>) => any;
+    oncontextmenu: (this: Window, ev: PointerEvent<Window>) => any;
+    ondblclick: (this: Window, ev: MouseEvent<Window>) => any;
+    ondevicelight: (this: Window, ev: DeviceLightEvent<Window>) => any;
+    ondevicemotion: (this: Window, ev: DeviceMotionEvent<Window>) => any;
+    ondeviceorientation: (this: Window, ev: DeviceOrientationEvent<Window>) => any;
+    ondrag: (this: Window, ev: DragEvent<Window>) => any;
+    ondragend: (this: Window, ev: DragEvent<Window>) => any;
+    ondragenter: (this: Window, ev: DragEvent<Window>) => any;
+    ondragleave: (this: Window, ev: DragEvent<Window>) => any;
+    ondragover: (this: Window, ev: DragEvent<Window>) => any;
+    ondragstart: (this: Window, ev: DragEvent<Window>) => any;
+    ondrop: (this: Window, ev: DragEvent<Window>) => any;
+    ondurationchange: (this: Window, ev: Event<Window>) => any;
+    onemptied: (this: Window, ev: Event<Window>) => any;
+    onended: (this: Window, ev: MediaStreamErrorEvent<Window>) => any;
     onerror: ErrorEventHandler;
-    onfocus: (this: Window, ev: FocusEvent) => any;
-    onhashchange: (this: Window, ev: HashChangeEvent) => any;
-    oninput: (this: Window, ev: Event) => any;
-    oninvalid: (this: Window, ev: Event) => any;
-    onkeydown: (this: Window, ev: KeyboardEvent) => any;
-    onkeypress: (this: Window, ev: KeyboardEvent) => any;
-    onkeyup: (this: Window, ev: KeyboardEvent) => any;
-    onload: (this: Window, ev: Event) => any;
-    onloadeddata: (this: Window, ev: Event) => any;
-    onloadedmetadata: (this: Window, ev: Event) => any;
-    onloadstart: (this: Window, ev: Event) => any;
-    onmessage: (this: Window, ev: MessageEvent) => any;
-    onmousedown: (this: Window, ev: MouseEvent) => any;
-    onmouseenter: (this: Window, ev: MouseEvent) => any;
-    onmouseleave: (this: Window, ev: MouseEvent) => any;
-    onmousemove: (this: Window, ev: MouseEvent) => any;
-    onmouseout: (this: Window, ev: MouseEvent) => any;
-    onmouseover: (this: Window, ev: MouseEvent) => any;
-    onmouseup: (this: Window, ev: MouseEvent) => any;
-    onmousewheel: (this: Window, ev: WheelEvent) => any;
-    onmsgesturechange: (this: Window, ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (this: Window, ev: MSGestureEvent) => any;
-    onmsgestureend: (this: Window, ev: MSGestureEvent) => any;
-    onmsgesturehold: (this: Window, ev: MSGestureEvent) => any;
-    onmsgesturestart: (this: Window, ev: MSGestureEvent) => any;
-    onmsgesturetap: (this: Window, ev: MSGestureEvent) => any;
-    onmsinertiastart: (this: Window, ev: MSGestureEvent) => any;
-    onmspointercancel: (this: Window, ev: MSPointerEvent) => any;
-    onmspointerdown: (this: Window, ev: MSPointerEvent) => any;
-    onmspointerenter: (this: Window, ev: MSPointerEvent) => any;
-    onmspointerleave: (this: Window, ev: MSPointerEvent) => any;
-    onmspointermove: (this: Window, ev: MSPointerEvent) => any;
-    onmspointerout: (this: Window, ev: MSPointerEvent) => any;
-    onmspointerover: (this: Window, ev: MSPointerEvent) => any;
-    onmspointerup: (this: Window, ev: MSPointerEvent) => any;
-    onoffline: (this: Window, ev: Event) => any;
-    ononline: (this: Window, ev: Event) => any;
-    onorientationchange: (this: Window, ev: Event) => any;
-    onpagehide: (this: Window, ev: PageTransitionEvent) => any;
-    onpageshow: (this: Window, ev: PageTransitionEvent) => any;
-    onpause: (this: Window, ev: Event) => any;
-    onplay: (this: Window, ev: Event) => any;
-    onplaying: (this: Window, ev: Event) => any;
-    onpopstate: (this: Window, ev: PopStateEvent) => any;
-    onprogress: (this: Window, ev: ProgressEvent) => any;
-    onratechange: (this: Window, ev: Event) => any;
-    onreadystatechange: (this: Window, ev: ProgressEvent) => any;
-    onreset: (this: Window, ev: Event) => any;
-    onresize: (this: Window, ev: UIEvent) => any;
-    onscroll: (this: Window, ev: UIEvent) => any;
-    onseeked: (this: Window, ev: Event) => any;
-    onseeking: (this: Window, ev: Event) => any;
-    onselect: (this: Window, ev: UIEvent) => any;
-    onstalled: (this: Window, ev: Event) => any;
-    onstorage: (this: Window, ev: StorageEvent) => any;
-    onsubmit: (this: Window, ev: Event) => any;
-    onsuspend: (this: Window, ev: Event) => any;
-    ontimeupdate: (this: Window, ev: Event) => any;
+    onfocus: (this: Window, ev: FocusEvent<Window>) => any;
+    onhashchange: (this: Window, ev: HashChangeEvent<Window>) => any;
+    oninput: (this: Window, ev: Event<Window>) => any;
+    oninvalid: (this: Window, ev: Event<Window>) => any;
+    onkeydown: (this: Window, ev: KeyboardEvent<Window>) => any;
+    onkeypress: (this: Window, ev: KeyboardEvent<Window>) => any;
+    onkeyup: (this: Window, ev: KeyboardEvent<Window>) => any;
+    onload: (this: Window, ev: Event<Window>) => any;
+    onloadeddata: (this: Window, ev: Event<Window>) => any;
+    onloadedmetadata: (this: Window, ev: Event<Window>) => any;
+    onloadstart: (this: Window, ev: Event<Window>) => any;
+    onmessage: (this: Window, ev: MessageEvent<Window>) => any;
+    onmousedown: (this: Window, ev: MouseEvent<Window>) => any;
+    onmouseenter: (this: Window, ev: MouseEvent<Window>) => any;
+    onmouseleave: (this: Window, ev: MouseEvent<Window>) => any;
+    onmousemove: (this: Window, ev: MouseEvent<Window>) => any;
+    onmouseout: (this: Window, ev: MouseEvent<Window>) => any;
+    onmouseover: (this: Window, ev: MouseEvent<Window>) => any;
+    onmouseup: (this: Window, ev: MouseEvent<Window>) => any;
+    onmousewheel: (this: Window, ev: WheelEvent<Window>) => any;
+    onmsgesturechange: (this: Window, ev: MSGestureEvent<Window>) => any;
+    onmsgesturedoubletap: (this: Window, ev: MSGestureEvent<Window>) => any;
+    onmsgestureend: (this: Window, ev: MSGestureEvent<Window>) => any;
+    onmsgesturehold: (this: Window, ev: MSGestureEvent<Window>) => any;
+    onmsgesturestart: (this: Window, ev: MSGestureEvent<Window>) => any;
+    onmsgesturetap: (this: Window, ev: MSGestureEvent<Window>) => any;
+    onmsinertiastart: (this: Window, ev: MSGestureEvent<Window>) => any;
+    onmspointercancel: (this: Window, ev: MSPointerEvent<Window>) => any;
+    onmspointerdown: (this: Window, ev: MSPointerEvent<Window>) => any;
+    onmspointerenter: (this: Window, ev: MSPointerEvent<Window>) => any;
+    onmspointerleave: (this: Window, ev: MSPointerEvent<Window>) => any;
+    onmspointermove: (this: Window, ev: MSPointerEvent<Window>) => any;
+    onmspointerout: (this: Window, ev: MSPointerEvent<Window>) => any;
+    onmspointerover: (this: Window, ev: MSPointerEvent<Window>) => any;
+    onmspointerup: (this: Window, ev: MSPointerEvent<Window>) => any;
+    onoffline: (this: Window, ev: Event<Window>) => any;
+    ononline: (this: Window, ev: Event<Window>) => any;
+    onorientationchange: (this: Window, ev: Event<Window>) => any;
+    onpagehide: (this: Window, ev: PageTransitionEvent<Window>) => any;
+    onpageshow: (this: Window, ev: PageTransitionEvent<Window>) => any;
+    onpause: (this: Window, ev: Event<Window>) => any;
+    onplay: (this: Window, ev: Event<Window>) => any;
+    onplaying: (this: Window, ev: Event<Window>) => any;
+    onpopstate: (this: Window, ev: PopStateEvent<Window>) => any;
+    onprogress: (this: Window, ev: ProgressEvent<Window>) => any;
+    onratechange: (this: Window, ev: Event<Window>) => any;
+    onreadystatechange: (this: Window, ev: ProgressEvent<Window>) => any;
+    onreset: (this: Window, ev: Event<Window>) => any;
+    onresize: (this: Window, ev: UIEvent<Window>) => any;
+    onscroll: (this: Window, ev: UIEvent<Window>) => any;
+    onseeked: (this: Window, ev: Event<Window>) => any;
+    onseeking: (this: Window, ev: Event<Window>) => any;
+    onselect: (this: Window, ev: UIEvent<Window>) => any;
+    onstalled: (this: Window, ev: Event<Window>) => any;
+    onstorage: (this: Window, ev: StorageEvent<Window>) => any;
+    onsubmit: (this: Window, ev: Event<Window>) => any;
+    onsuspend: (this: Window, ev: Event<Window>) => any;
+    ontimeupdate: (this: Window, ev: Event<Window>) => any;
     ontouchcancel: (ev: TouchEvent) => any;
     ontouchend: (ev: TouchEvent) => any;
     ontouchmove: (ev: TouchEvent) => any;
     ontouchstart: (ev: TouchEvent) => any;
-    onunload: (this: Window, ev: Event) => any;
-    onvolumechange: (this: Window, ev: Event) => any;
-    onwaiting: (this: Window, ev: Event) => any;
+    onunload: (this: Window, ev: Event<Window>) => any;
+    onvolumechange: (this: Window, ev: Event<Window>) => any;
+    onwaiting: (this: Window, ev: Event<Window>) => any;
     opener: any;
     orientation: string | number;
     readonly outerHeight: number;
@@ -13268,7 +13262,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     scrollTo(options?: ScrollToOptions): void;
     scrollBy(options?: ScrollToOptions): void;
     addEventListener<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<Window>, useCapture?: boolean): void;
 }
 
 declare var Window: {
@@ -13280,12 +13274,12 @@ interface WorkerEventMap extends AbstractWorkerEventMap {
     "message": MessageEvent;
 }
 
-interface Worker extends EventTarget, AbstractWorker {
-    onmessage: (this: Worker, ev: MessageEvent) => any;
+interface Worker extends EventTarget, AbstractWorker<Worker> {
+    onmessage: (this: Worker, ev: MessageEvent<Worker>) => any;
     postMessage(message: any, transfer?: any[]): void;
     terminate(): void;
     addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<Worker>, useCapture?: boolean): void;
 }
 
 declare var Worker: {
@@ -13295,7 +13289,7 @@ declare var Worker: {
 
 interface XMLDocument extends Document {
     addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: XMLDocument, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<XMLDocument>, useCapture?: boolean): void;
 }
 
 declare var XMLDocument: {
@@ -13307,8 +13301,8 @@ interface XMLHttpRequestEventMap extends XMLHttpRequestEventTargetEventMap {
     "readystatechange": Event;
 }
 
-interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
-    onreadystatechange: (this: XMLHttpRequest, ev: Event) => any;
+interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget<XMLHttpRequest> {
+    onreadystatechange: (this: XMLHttpRequest, ev: Event<XMLHttpRequest>) => any;
     readonly readyState: number;
     readonly response: any;
     readonly responseText: string;
@@ -13337,7 +13331,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly OPENED: number;
     readonly UNSENT: number;
     addEventListener<K extends keyof XMLHttpRequestEventMap>(type: K, listener: (this: XMLHttpRequest, ev: XMLHttpRequestEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<XMLHttpRequest>, useCapture?: boolean): void;
 }
 
 declare var XMLHttpRequest: {
@@ -13350,9 +13344,9 @@ declare var XMLHttpRequest: {
     readonly UNSENT: number;
 }
 
-interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget {
+interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget<XMLHttpRequestUpload> {
     addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestUpload, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<XMLHttpRequestUpload>, useCapture?: boolean): void;
 }
 
 declare var XMLHttpRequestUpload: {
@@ -13453,7 +13447,7 @@ declare var XSLTProcessor: {
 
 interface webkitRTCPeerConnection extends RTCPeerConnection {
     addEventListener<K extends keyof RTCPeerConnectionEventMap>(type: K, listener: (this: webkitRTCPeerConnection, ev: RTCPeerConnectionEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<webkitRTCPeerConnection>, useCapture?: boolean): void;
 }
 
 declare var webkitRTCPeerConnection: {
@@ -13465,10 +13459,8 @@ interface AbstractWorkerEventMap {
     "error": ErrorEvent;
 }
 
-interface AbstractWorker {
-    onerror: (this: AbstractWorker, ev: ErrorEvent) => any;
-    addEventListener<K extends keyof AbstractWorkerEventMap>(type: K, listener: (this: AbstractWorker, ev: AbstractWorkerEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+interface AbstractWorker<T extends EventTarget<T> = EventTarget> {
+    onerror: (this: AbstractWorker, ev: ErrorEvent<T>) => any;
 }
 
 interface Body {
@@ -13603,18 +13595,16 @@ interface GlobalEventHandlersEventMap {
     "wheel": WheelEvent;
 }
 
-interface GlobalEventHandlers {
-    onpointercancel: (this: GlobalEventHandlers, ev: PointerEvent) => any;
-    onpointerdown: (this: GlobalEventHandlers, ev: PointerEvent) => any;
-    onpointerenter: (this: GlobalEventHandlers, ev: PointerEvent) => any;
-    onpointerleave: (this: GlobalEventHandlers, ev: PointerEvent) => any;
-    onpointermove: (this: GlobalEventHandlers, ev: PointerEvent) => any;
-    onpointerout: (this: GlobalEventHandlers, ev: PointerEvent) => any;
-    onpointerover: (this: GlobalEventHandlers, ev: PointerEvent) => any;
-    onpointerup: (this: GlobalEventHandlers, ev: PointerEvent) => any;
-    onwheel: (this: GlobalEventHandlers, ev: WheelEvent) => any;
-    addEventListener<K extends keyof GlobalEventHandlersEventMap>(type: K, listener: (this: GlobalEventHandlers, ev: GlobalEventHandlersEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+interface GlobalEventHandlers<T extends EventTarget<T> = EventTarget> {
+    onpointercancel: (this: GlobalEventHandlers, ev: PointerEvent<T>) => any;
+    onpointerdown: (this: GlobalEventHandlers, ev: PointerEvent<T>) => any;
+    onpointerenter: (this: GlobalEventHandlers, ev: PointerEvent<T>) => any;
+    onpointerleave: (this: GlobalEventHandlers, ev: PointerEvent<T>) => any;
+    onpointermove: (this: GlobalEventHandlers, ev: PointerEvent<T>) => any;
+    onpointerout: (this: GlobalEventHandlers, ev: PointerEvent<T>) => any;
+    onpointerover: (this: GlobalEventHandlers, ev: PointerEvent<T>) => any;
+    onpointerup: (this: GlobalEventHandlers, ev: PointerEvent<T>) => any;
+    onwheel: (this: GlobalEventHandlers, ev: WheelEvent<T>) => any;
 }
 
 interface GlobalFetch {
@@ -13653,21 +13643,19 @@ interface MSBaseReaderEventMap {
     "progress": ProgressEvent;
 }
 
-interface MSBaseReader {
-    onabort: (this: MSBaseReader, ev: Event) => any;
-    onerror: (this: MSBaseReader, ev: ErrorEvent) => any;
-    onload: (this: MSBaseReader, ev: Event) => any;
-    onloadend: (this: MSBaseReader, ev: ProgressEvent) => any;
-    onloadstart: (this: MSBaseReader, ev: Event) => any;
-    onprogress: (this: MSBaseReader, ev: ProgressEvent) => any;
+interface MSBaseReader<T extends EventTarget<T> = EventTarget> {
+    onabort: (this: MSBaseReader, ev: Event<T>) => any;
+    onerror: (this: MSBaseReader, ev: ErrorEvent<T>) => any;
+    onload: (this: MSBaseReader, ev: Event<T>) => any;
+    onloadend: (this: MSBaseReader, ev: ProgressEvent<T>) => any;
+    onloadstart: (this: MSBaseReader, ev: Event<T>) => any;
+    onprogress: (this: MSBaseReader, ev: ProgressEvent<T>) => any;
     readonly readyState: number;
     readonly result: any;
     abort(): void;
     readonly DONE: number;
     readonly EMPTY: number;
     readonly LOADING: number;
-    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 interface MSFileSaver {
@@ -13805,16 +13793,14 @@ interface XMLHttpRequestEventTargetEventMap {
     "timeout": ProgressEvent;
 }
 
-interface XMLHttpRequestEventTarget {
-    onabort: (this: XMLHttpRequestEventTarget, ev: Event) => any;
-    onerror: (this: XMLHttpRequestEventTarget, ev: ErrorEvent) => any;
-    onload: (this: XMLHttpRequestEventTarget, ev: Event) => any;
-    onloadend: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
-    onloadstart: (this: XMLHttpRequestEventTarget, ev: Event) => any;
-    onprogress: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
-    ontimeout: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
-    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+interface XMLHttpRequestEventTarget<T extends EventTarget<T> = EventTarget> {
+    onabort: (this: XMLHttpRequestEventTarget, ev: Event<T>) => any;
+    onerror: (this: XMLHttpRequestEventTarget, ev: ErrorEvent<T>) => any;
+    onload: (this: XMLHttpRequestEventTarget, ev: Event<T>) => any;
+    onloadend: (this: XMLHttpRequestEventTarget, ev: ProgressEvent<T>) => any;
+    onloadstart: (this: XMLHttpRequestEventTarget, ev: Event<T>) => any;
+    onprogress: (this: XMLHttpRequestEventTarget, ev: ProgressEvent<T>) => any;
+    ontimeout: (this: XMLHttpRequestEventTarget, ev: ProgressEvent<T>) => any;
 }
 
 interface ErrorEventInit {
@@ -13825,6 +13811,12 @@ interface ErrorEventInit {
     error?: any;
 }
 
+interface EventTarget<T = any> {
+    addEventListener(type: string, listener?: EventListenerOrEventListenerObject<EventTarget<T>>, useCapture?: boolean): void;
+    dispatchEvent(evt: Event): boolean;
+    removeEventListener(type: string, listener?: EventListenerOrEventListenerObject<EventTarget<T>>, useCapture?: boolean): void;
+}
+
 interface StorageEventInit extends EventInit {
     key?: string;
     oldValue?: string;
@@ -13911,8 +13903,8 @@ interface FilePropertyBag {
     lastModified?: number;
 }
 
-interface EventListenerObject {
-    handleEvent(evt: Event): void;
+interface EventListenerObject<T extends EventTarget> {
+    handleEvent(evt: Event<T>): void;
 }
 
 interface ProgressEventInit extends EventInit {
@@ -14168,7 +14160,7 @@ interface PromiseRejectionEventInit extends EventInit {
     reason?: any;
 }
 
-declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
+declare type EventListenerOrEventListenerObject<T extends EventTarget<T>> = EventListener<T> | EventListenerObject<T>;
 
 interface ErrorEventHandler {
     (message: string, filename?: string, lineno?: number, colno?: number, error?:Error): void;
@@ -14712,97 +14704,97 @@ declare var msCredentials: MSCredentials;
 declare const name: never;
 declare var navigator: Navigator;
 declare var offscreenBuffering: string | boolean;
-declare var onabort: (this: Window, ev: UIEvent) => any;
-declare var onafterprint: (this: Window, ev: Event) => any;
-declare var onbeforeprint: (this: Window, ev: Event) => any;
-declare var onbeforeunload: (this: Window, ev: BeforeUnloadEvent) => any;
-declare var onblur: (this: Window, ev: FocusEvent) => any;
-declare var oncanplay: (this: Window, ev: Event) => any;
-declare var oncanplaythrough: (this: Window, ev: Event) => any;
-declare var onchange: (this: Window, ev: Event) => any;
-declare var onclick: (this: Window, ev: MouseEvent) => any;
-declare var oncompassneedscalibration: (this: Window, ev: Event) => any;
-declare var oncontextmenu: (this: Window, ev: PointerEvent) => any;
-declare var ondblclick: (this: Window, ev: MouseEvent) => any;
-declare var ondevicelight: (this: Window, ev: DeviceLightEvent) => any;
-declare var ondevicemotion: (this: Window, ev: DeviceMotionEvent) => any;
-declare var ondeviceorientation: (this: Window, ev: DeviceOrientationEvent) => any;
-declare var ondrag: (this: Window, ev: DragEvent) => any;
-declare var ondragend: (this: Window, ev: DragEvent) => any;
-declare var ondragenter: (this: Window, ev: DragEvent) => any;
-declare var ondragleave: (this: Window, ev: DragEvent) => any;
-declare var ondragover: (this: Window, ev: DragEvent) => any;
-declare var ondragstart: (this: Window, ev: DragEvent) => any;
-declare var ondrop: (this: Window, ev: DragEvent) => any;
-declare var ondurationchange: (this: Window, ev: Event) => any;
-declare var onemptied: (this: Window, ev: Event) => any;
-declare var onended: (this: Window, ev: MediaStreamErrorEvent) => any;
+declare var onabort: (this: Window, ev: UIEvent<Window>) => any;
+declare var onafterprint: (this: Window, ev: Event<Window>) => any;
+declare var onbeforeprint: (this: Window, ev: Event<Window>) => any;
+declare var onbeforeunload: (this: Window, ev: BeforeUnloadEvent<Window>) => any;
+declare var onblur: (this: Window, ev: FocusEvent<Window>) => any;
+declare var oncanplay: (this: Window, ev: Event<Window>) => any;
+declare var oncanplaythrough: (this: Window, ev: Event<Window>) => any;
+declare var onchange: (this: Window, ev: Event<Window>) => any;
+declare var onclick: (this: Window, ev: MouseEvent<Window>) => any;
+declare var oncompassneedscalibration: (this: Window, ev: Event<Window>) => any;
+declare var oncontextmenu: (this: Window, ev: PointerEvent<Window>) => any;
+declare var ondblclick: (this: Window, ev: MouseEvent<Window>) => any;
+declare var ondevicelight: (this: Window, ev: DeviceLightEvent<Window>) => any;
+declare var ondevicemotion: (this: Window, ev: DeviceMotionEvent<Window>) => any;
+declare var ondeviceorientation: (this: Window, ev: DeviceOrientationEvent<Window>) => any;
+declare var ondrag: (this: Window, ev: DragEvent<Window>) => any;
+declare var ondragend: (this: Window, ev: DragEvent<Window>) => any;
+declare var ondragenter: (this: Window, ev: DragEvent<Window>) => any;
+declare var ondragleave: (this: Window, ev: DragEvent<Window>) => any;
+declare var ondragover: (this: Window, ev: DragEvent<Window>) => any;
+declare var ondragstart: (this: Window, ev: DragEvent<Window>) => any;
+declare var ondrop: (this: Window, ev: DragEvent<Window>) => any;
+declare var ondurationchange: (this: Window, ev: Event<Window>) => any;
+declare var onemptied: (this: Window, ev: Event<Window>) => any;
+declare var onended: (this: Window, ev: MediaStreamErrorEvent<Window>) => any;
 declare var onerror: ErrorEventHandler;
-declare var onfocus: (this: Window, ev: FocusEvent) => any;
-declare var onhashchange: (this: Window, ev: HashChangeEvent) => any;
-declare var oninput: (this: Window, ev: Event) => any;
-declare var oninvalid: (this: Window, ev: Event) => any;
-declare var onkeydown: (this: Window, ev: KeyboardEvent) => any;
-declare var onkeypress: (this: Window, ev: KeyboardEvent) => any;
-declare var onkeyup: (this: Window, ev: KeyboardEvent) => any;
-declare var onload: (this: Window, ev: Event) => any;
-declare var onloadeddata: (this: Window, ev: Event) => any;
-declare var onloadedmetadata: (this: Window, ev: Event) => any;
-declare var onloadstart: (this: Window, ev: Event) => any;
-declare var onmessage: (this: Window, ev: MessageEvent) => any;
-declare var onmousedown: (this: Window, ev: MouseEvent) => any;
-declare var onmouseenter: (this: Window, ev: MouseEvent) => any;
-declare var onmouseleave: (this: Window, ev: MouseEvent) => any;
-declare var onmousemove: (this: Window, ev: MouseEvent) => any;
-declare var onmouseout: (this: Window, ev: MouseEvent) => any;
-declare var onmouseover: (this: Window, ev: MouseEvent) => any;
-declare var onmouseup: (this: Window, ev: MouseEvent) => any;
-declare var onmousewheel: (this: Window, ev: WheelEvent) => any;
-declare var onmsgesturechange: (this: Window, ev: MSGestureEvent) => any;
-declare var onmsgesturedoubletap: (this: Window, ev: MSGestureEvent) => any;
-declare var onmsgestureend: (this: Window, ev: MSGestureEvent) => any;
-declare var onmsgesturehold: (this: Window, ev: MSGestureEvent) => any;
-declare var onmsgesturestart: (this: Window, ev: MSGestureEvent) => any;
-declare var onmsgesturetap: (this: Window, ev: MSGestureEvent) => any;
-declare var onmsinertiastart: (this: Window, ev: MSGestureEvent) => any;
-declare var onmspointercancel: (this: Window, ev: MSPointerEvent) => any;
-declare var onmspointerdown: (this: Window, ev: MSPointerEvent) => any;
-declare var onmspointerenter: (this: Window, ev: MSPointerEvent) => any;
-declare var onmspointerleave: (this: Window, ev: MSPointerEvent) => any;
-declare var onmspointermove: (this: Window, ev: MSPointerEvent) => any;
-declare var onmspointerout: (this: Window, ev: MSPointerEvent) => any;
-declare var onmspointerover: (this: Window, ev: MSPointerEvent) => any;
-declare var onmspointerup: (this: Window, ev: MSPointerEvent) => any;
-declare var onoffline: (this: Window, ev: Event) => any;
-declare var ononline: (this: Window, ev: Event) => any;
-declare var onorientationchange: (this: Window, ev: Event) => any;
-declare var onpagehide: (this: Window, ev: PageTransitionEvent) => any;
-declare var onpageshow: (this: Window, ev: PageTransitionEvent) => any;
-declare var onpause: (this: Window, ev: Event) => any;
-declare var onplay: (this: Window, ev: Event) => any;
-declare var onplaying: (this: Window, ev: Event) => any;
-declare var onpopstate: (this: Window, ev: PopStateEvent) => any;
-declare var onprogress: (this: Window, ev: ProgressEvent) => any;
-declare var onratechange: (this: Window, ev: Event) => any;
-declare var onreadystatechange: (this: Window, ev: ProgressEvent) => any;
-declare var onreset: (this: Window, ev: Event) => any;
-declare var onresize: (this: Window, ev: UIEvent) => any;
-declare var onscroll: (this: Window, ev: UIEvent) => any;
-declare var onseeked: (this: Window, ev: Event) => any;
-declare var onseeking: (this: Window, ev: Event) => any;
-declare var onselect: (this: Window, ev: UIEvent) => any;
-declare var onstalled: (this: Window, ev: Event) => any;
-declare var onstorage: (this: Window, ev: StorageEvent) => any;
-declare var onsubmit: (this: Window, ev: Event) => any;
-declare var onsuspend: (this: Window, ev: Event) => any;
-declare var ontimeupdate: (this: Window, ev: Event) => any;
+declare var onfocus: (this: Window, ev: FocusEvent<Window>) => any;
+declare var onhashchange: (this: Window, ev: HashChangeEvent<Window>) => any;
+declare var oninput: (this: Window, ev: Event<Window>) => any;
+declare var oninvalid: (this: Window, ev: Event<Window>) => any;
+declare var onkeydown: (this: Window, ev: KeyboardEvent<Window>) => any;
+declare var onkeypress: (this: Window, ev: KeyboardEvent<Window>) => any;
+declare var onkeyup: (this: Window, ev: KeyboardEvent<Window>) => any;
+declare var onload: (this: Window, ev: Event<Window>) => any;
+declare var onloadeddata: (this: Window, ev: Event<Window>) => any;
+declare var onloadedmetadata: (this: Window, ev: Event<Window>) => any;
+declare var onloadstart: (this: Window, ev: Event<Window>) => any;
+declare var onmessage: (this: Window, ev: MessageEvent<Window>) => any;
+declare var onmousedown: (this: Window, ev: MouseEvent<Window>) => any;
+declare var onmouseenter: (this: Window, ev: MouseEvent<Window>) => any;
+declare var onmouseleave: (this: Window, ev: MouseEvent<Window>) => any;
+declare var onmousemove: (this: Window, ev: MouseEvent<Window>) => any;
+declare var onmouseout: (this: Window, ev: MouseEvent<Window>) => any;
+declare var onmouseover: (this: Window, ev: MouseEvent<Window>) => any;
+declare var onmouseup: (this: Window, ev: MouseEvent<Window>) => any;
+declare var onmousewheel: (this: Window, ev: WheelEvent<Window>) => any;
+declare var onmsgesturechange: (this: Window, ev: MSGestureEvent<Window>) => any;
+declare var onmsgesturedoubletap: (this: Window, ev: MSGestureEvent<Window>) => any;
+declare var onmsgestureend: (this: Window, ev: MSGestureEvent<Window>) => any;
+declare var onmsgesturehold: (this: Window, ev: MSGestureEvent<Window>) => any;
+declare var onmsgesturestart: (this: Window, ev: MSGestureEvent<Window>) => any;
+declare var onmsgesturetap: (this: Window, ev: MSGestureEvent<Window>) => any;
+declare var onmsinertiastart: (this: Window, ev: MSGestureEvent<Window>) => any;
+declare var onmspointercancel: (this: Window, ev: MSPointerEvent<Window>) => any;
+declare var onmspointerdown: (this: Window, ev: MSPointerEvent<Window>) => any;
+declare var onmspointerenter: (this: Window, ev: MSPointerEvent<Window>) => any;
+declare var onmspointerleave: (this: Window, ev: MSPointerEvent<Window>) => any;
+declare var onmspointermove: (this: Window, ev: MSPointerEvent<Window>) => any;
+declare var onmspointerout: (this: Window, ev: MSPointerEvent<Window>) => any;
+declare var onmspointerover: (this: Window, ev: MSPointerEvent<Window>) => any;
+declare var onmspointerup: (this: Window, ev: MSPointerEvent<Window>) => any;
+declare var onoffline: (this: Window, ev: Event<Window>) => any;
+declare var ononline: (this: Window, ev: Event<Window>) => any;
+declare var onorientationchange: (this: Window, ev: Event<Window>) => any;
+declare var onpagehide: (this: Window, ev: PageTransitionEvent<Window>) => any;
+declare var onpageshow: (this: Window, ev: PageTransitionEvent<Window>) => any;
+declare var onpause: (this: Window, ev: Event<Window>) => any;
+declare var onplay: (this: Window, ev: Event<Window>) => any;
+declare var onplaying: (this: Window, ev: Event<Window>) => any;
+declare var onpopstate: (this: Window, ev: PopStateEvent<Window>) => any;
+declare var onprogress: (this: Window, ev: ProgressEvent<Window>) => any;
+declare var onratechange: (this: Window, ev: Event<Window>) => any;
+declare var onreadystatechange: (this: Window, ev: ProgressEvent<Window>) => any;
+declare var onreset: (this: Window, ev: Event<Window>) => any;
+declare var onresize: (this: Window, ev: UIEvent<Window>) => any;
+declare var onscroll: (this: Window, ev: UIEvent<Window>) => any;
+declare var onseeked: (this: Window, ev: Event<Window>) => any;
+declare var onseeking: (this: Window, ev: Event<Window>) => any;
+declare var onselect: (this: Window, ev: UIEvent<Window>) => any;
+declare var onstalled: (this: Window, ev: Event<Window>) => any;
+declare var onstorage: (this: Window, ev: StorageEvent<Window>) => any;
+declare var onsubmit: (this: Window, ev: Event<Window>) => any;
+declare var onsuspend: (this: Window, ev: Event<Window>) => any;
+declare var ontimeupdate: (this: Window, ev: Event<Window>) => any;
 declare var ontouchcancel: (ev: TouchEvent) => any;
 declare var ontouchend: (ev: TouchEvent) => any;
 declare var ontouchmove: (ev: TouchEvent) => any;
 declare var ontouchstart: (ev: TouchEvent) => any;
-declare var onunload: (this: Window, ev: Event) => any;
-declare var onvolumechange: (this: Window, ev: Event) => any;
-declare var onwaiting: (this: Window, ev: Event) => any;
+declare var onunload: (this: Window, ev: Event<Window>) => any;
+declare var onvolumechange: (this: Window, ev: Event<Window>) => any;
+declare var onwaiting: (this: Window, ev: Event<Window>) => any;
 declare var opener: any;
 declare var orientation: string | number;
 declare var outerHeight: number;
@@ -14867,7 +14859,7 @@ declare function scrollTo(options?: ScrollToOptions): void;
 declare function scrollBy(options?: ScrollToOptions): void;
 declare function toString(): string;
 declare function dispatchEvent(evt: Event): boolean;
-declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject<Window>, useCapture?: boolean): void;
 declare function clearInterval(handle: number): void;
 declare function clearTimeout(handle: number): void;
 declare function setInterval(handler: (...args: any[]) => void, timeout: number): number;
@@ -14880,21 +14872,21 @@ declare function setImmediate(handler: any, ...args: any[]): number;
 declare var sessionStorage: Storage;
 declare var localStorage: Storage;
 declare var console: Console;
-declare var onpointercancel: (this: Window, ev: PointerEvent) => any;
-declare var onpointerdown: (this: Window, ev: PointerEvent) => any;
-declare var onpointerenter: (this: Window, ev: PointerEvent) => any;
-declare var onpointerleave: (this: Window, ev: PointerEvent) => any;
-declare var onpointermove: (this: Window, ev: PointerEvent) => any;
-declare var onpointerout: (this: Window, ev: PointerEvent) => any;
-declare var onpointerover: (this: Window, ev: PointerEvent) => any;
-declare var onpointerup: (this: Window, ev: PointerEvent) => any;
-declare var onwheel: (this: Window, ev: WheelEvent) => any;
+declare var onpointercancel: (this: Window, ev: PointerEvent<Window>) => any;
+declare var onpointerdown: (this: Window, ev: PointerEvent<Window>) => any;
+declare var onpointerenter: (this: Window, ev: PointerEvent<Window>) => any;
+declare var onpointerleave: (this: Window, ev: PointerEvent<Window>) => any;
+declare var onpointermove: (this: Window, ev: PointerEvent<Window>) => any;
+declare var onpointerout: (this: Window, ev: PointerEvent<Window>) => any;
+declare var onpointerover: (this: Window, ev: PointerEvent<Window>) => any;
+declare var onpointerup: (this: Window, ev: PointerEvent<Window>) => any;
+declare var onwheel: (this: Window, ev: WheelEvent<Window>) => any;
 declare var indexedDB: IDBFactory;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
 declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
 declare function addEventListener<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, useCapture?: boolean): void;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject<Window>, useCapture?: boolean): void;
 type AAGUID = string;
 type AlgorithmIdentifier = string | Algorithm;
 type BodyInit = any;
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
index fb9358fc0..6ba03f7f2 100644
--- a/baselines/webworker.generated.d.ts
+++ b/baselines/webworker.generated.d.ts
@@ -123,20 +123,20 @@ interface SyncEventInit extends ExtendableEventInit {
     lastChance?: boolean;
 }
 
-interface EventListener {
-    (evt: Event): void;
+interface EventListener<T extends EventTarget<T>> {
+    (evt: Event<T>): void;
 }
 
 interface WebKitEntriesCallback {
-    (evt: Event): void;
+    (entries: WebKitEntry[]): void;
 }
 
 interface WebKitErrorCallback {
-    (evt: Event): void;
+    (err: DOMError): void;
 }
 
 interface WebKitFileCallback {
-    (evt: Event): void;
+    (file: File): void;
 }
 
 interface AudioBuffer {
@@ -195,7 +195,7 @@ declare var CacheStorage: {
     new(): CacheStorage;
 }
 
-interface CloseEvent extends Event {
+interface CloseEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly code: number;
     readonly reason: string;
     readonly wasClean: boolean;
@@ -352,7 +352,7 @@ declare var DOMStringList: {
     new(): DOMStringList;
 }
 
-interface ErrorEvent extends Event {
+interface ErrorEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly colno: number;
     readonly error: any;
     readonly filename: string;
@@ -366,17 +366,17 @@ declare var ErrorEvent: {
     new(type: string, errorEventInitDict?: ErrorEventInit): ErrorEvent;
 }
 
-interface Event {
+interface Event<T extends EventTarget<T> = EventTarget> {
     readonly bubbles: boolean;
     cancelBubble: boolean;
     readonly cancelable: boolean;
-    readonly currentTarget: EventTarget;
+    readonly currentTarget: T;
     readonly defaultPrevented: boolean;
     readonly eventPhase: number;
     readonly isTrusted: boolean;
     returnValue: boolean;
     readonly srcElement: any;
-    readonly target: EventTarget;
+    readonly target: T;
     readonly timeStamp: number;
     readonly type: string;
     readonly scoped: boolean;
@@ -398,12 +398,6 @@ declare var Event: {
     readonly CAPTURING_PHASE: number;
 }
 
-interface EventTarget {
-    addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    dispatchEvent(evt: Event): boolean;
-    removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
 declare var EventTarget: {
     prototype: EventTarget;
     new(): EventTarget;
@@ -431,14 +425,14 @@ declare var FileList: {
     new(): FileList;
 }
 
-interface FileReader extends EventTarget, MSBaseReader {
+interface FileReader extends EventTarget, MSBaseReader<FileReader> {
     readonly error: DOMError;
     readAsArrayBuffer(blob: Blob): void;
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
     readAsText(blob: Blob, encoding?: string): void;
     addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: FileReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<FileReader>, useCapture?: boolean): void;
 }
 
 declare var FileReader: {
@@ -501,8 +495,8 @@ interface IDBDatabaseEventMap {
 interface IDBDatabase extends EventTarget {
     readonly name: string;
     readonly objectStoreNames: DOMStringList;
-    onabort: (this: IDBDatabase, ev: Event) => any;
-    onerror: (this: IDBDatabase, ev: Event) => any;
+    onabort: (this: IDBDatabase, ev: Event<IDBDatabase>) => any;
+    onerror: (this: IDBDatabase, ev: Event<IDBDatabase>) => any;
     version: number;
     onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
@@ -511,7 +505,7 @@ interface IDBDatabase extends EventTarget {
     transaction(storeNames: string | string[], mode?: string): IDBTransaction;
     addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
     addEventListener<K extends keyof IDBDatabaseEventMap>(type: K, listener: (this: IDBDatabase, ev: IDBDatabaseEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<IDBDatabase>, useCapture?: boolean): void;
 }
 
 declare var IDBDatabase: {
@@ -593,10 +587,10 @@ interface IDBOpenDBRequestEventMap extends IDBRequestEventMap {
 }
 
 interface IDBOpenDBRequest extends IDBRequest {
-    onblocked: (this: IDBOpenDBRequest, ev: Event) => any;
-    onupgradeneeded: (this: IDBOpenDBRequest, ev: IDBVersionChangeEvent) => any;
+    onblocked: (this: IDBOpenDBRequest, ev: Event<IDBOpenDBRequest>) => any;
+    onupgradeneeded: (this: IDBOpenDBRequest, ev: IDBVersionChangeEvent<IDBOpenDBRequest>) => any;
     addEventListener<K extends keyof IDBOpenDBRequestEventMap>(type: K, listener: (this: IDBOpenDBRequest, ev: IDBOpenDBRequestEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<IDBOpenDBRequest>, useCapture?: boolean): void;
 }
 
 declare var IDBOpenDBRequest: {
@@ -611,14 +605,14 @@ interface IDBRequestEventMap {
 
 interface IDBRequest extends EventTarget {
     readonly error: DOMError;
-    onerror: (this: IDBRequest, ev: Event) => any;
-    onsuccess: (this: IDBRequest, ev: Event) => any;
+    onerror: (this: IDBRequest, ev: Event<IDBRequest>) => any;
+    onsuccess: (this: IDBRequest, ev: Event<IDBRequest>) => any;
     readonly readyState: string;
     readonly result: any;
     source: IDBObjectStore | IDBIndex | IDBCursor;
     readonly transaction: IDBTransaction;
     addEventListener<K extends keyof IDBRequestEventMap>(type: K, listener: (this: IDBRequest, ev: IDBRequestEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<IDBRequest>, useCapture?: boolean): void;
 }
 
 declare var IDBRequest: {
@@ -636,16 +630,16 @@ interface IDBTransaction extends EventTarget {
     readonly db: IDBDatabase;
     readonly error: DOMError;
     readonly mode: string;
-    onabort: (this: IDBTransaction, ev: Event) => any;
-    oncomplete: (this: IDBTransaction, ev: Event) => any;
-    onerror: (this: IDBTransaction, ev: Event) => any;
+    onabort: (this: IDBTransaction, ev: Event<IDBTransaction>) => any;
+    oncomplete: (this: IDBTransaction, ev: Event<IDBTransaction>) => any;
+    onerror: (this: IDBTransaction, ev: Event<IDBTransaction>) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
     readonly READ_ONLY: string;
     readonly READ_WRITE: string;
     readonly VERSION_CHANGE: string;
     addEventListener<K extends keyof IDBTransactionEventMap>(type: K, listener: (this: IDBTransaction, ev: IDBTransactionEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<IDBTransaction>, useCapture?: boolean): void;
 }
 
 declare var IDBTransaction: {
@@ -656,7 +650,7 @@ declare var IDBTransaction: {
     readonly VERSION_CHANGE: string;
 }
 
-interface IDBVersionChangeEvent extends Event {
+interface IDBVersionChangeEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly newVersion: number | null;
     readonly oldVersion: number;
 }
@@ -688,7 +682,7 @@ declare var MessageChannel: {
     new(): MessageChannel;
 }
 
-interface MessageEvent extends Event {
+interface MessageEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly data: any;
     readonly origin: string;
     readonly ports: any;
@@ -706,12 +700,12 @@ interface MessagePortEventMap {
 }
 
 interface MessagePort extends EventTarget {
-    onmessage: (this: MessagePort, ev: MessageEvent) => any;
+    onmessage: (this: MessagePort, ev: MessageEvent<MessagePort>) => any;
     close(): void;
     postMessage(message?: any, transfer?: any[]): void;
     start(): void;
     addEventListener<K extends keyof MessagePortEventMap>(type: K, listener: (this: MessagePort, ev: MessagePortEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<MessagePort>, useCapture?: boolean): void;
 }
 
 declare var MessagePort: {
@@ -731,16 +725,16 @@ interface Notification extends EventTarget {
     readonly dir: string;
     readonly icon: string;
     readonly lang: string;
-    onclick: (this: Notification, ev: Event) => any;
-    onclose: (this: Notification, ev: Event) => any;
-    onerror: (this: Notification, ev: Event) => any;
-    onshow: (this: Notification, ev: Event) => any;
+    onclick: (this: Notification, ev: Event<Notification>) => any;
+    onclose: (this: Notification, ev: Event<Notification>) => any;
+    onerror: (this: Notification, ev: Event<Notification>) => any;
+    onshow: (this: Notification, ev: Event<Notification>) => any;
     readonly permission: string;
     readonly tag: string;
     readonly title: string;
     close(): void;
     addEventListener<K extends keyof NotificationEventMap>(type: K, listener: (this: Notification, ev: NotificationEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<Notification>, useCapture?: boolean): void;
 }
 
 declare var Notification: {
@@ -849,7 +843,7 @@ declare var PositionError: {
     readonly TIMEOUT: number;
 }
 
-interface ProgressEvent extends Event {
+interface ProgressEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     readonly lengthComputable: boolean;
     readonly loaded: number;
     readonly total: number;
@@ -959,13 +953,13 @@ interface ServiceWorkerEventMap extends AbstractWorkerEventMap {
     "statechange": Event;
 }
 
-interface ServiceWorker extends EventTarget, AbstractWorker {
-    onstatechange: (this: ServiceWorker, ev: Event) => any;
+interface ServiceWorker extends EventTarget, AbstractWorker<ServiceWorker> {
+    onstatechange: (this: ServiceWorker, ev: Event<ServiceWorker>) => any;
     readonly scriptURL: USVString;
     readonly state: string;
     postMessage(message: any, transfer?: any[]): void;
     addEventListener<K extends keyof ServiceWorkerEventMap>(type: K, listener: (this: ServiceWorker, ev: ServiceWorkerEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<ServiceWorker>, useCapture?: boolean): void;
 }
 
 declare var ServiceWorker: {
@@ -980,7 +974,7 @@ interface ServiceWorkerRegistrationEventMap {
 interface ServiceWorkerRegistration extends EventTarget {
     readonly active: ServiceWorker | null;
     readonly installing: ServiceWorker | null;
-    onupdatefound: (this: ServiceWorkerRegistration, ev: Event) => any;
+    onupdatefound: (this: ServiceWorkerRegistration, ev: Event<ServiceWorkerRegistration>) => any;
     readonly pushManager: PushManager;
     readonly scope: USVString;
     readonly sync: SyncManager;
@@ -990,7 +984,7 @@ interface ServiceWorkerRegistration extends EventTarget {
     unregister(): Promise<boolean>;
     update(): Promise<void>;
     addEventListener<K extends keyof ServiceWorkerRegistrationEventMap>(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<ServiceWorkerRegistration>, useCapture?: boolean): void;
 }
 
 declare var ServiceWorkerRegistration: {
@@ -1008,6 +1002,47 @@ declare var SyncManager: {
     new(): SyncManager;
 }
 
+interface WebKitDirectoryEntry extends WebKitEntry {
+    createReader(): WebKitDirectoryReader;
+}
+
+declare var WebKitDirectoryEntry: {
+    prototype: WebKitDirectoryEntry;
+    new(): WebKitDirectoryEntry;
+}
+
+interface WebKitDirectoryReader {
+    readEntries(successCallback: WebKitEntriesCallback, errorCallback?: WebKitErrorCallback): void;
+}
+
+declare var WebKitDirectoryReader: {
+    prototype: WebKitDirectoryReader;
+    new(): WebKitDirectoryReader;
+}
+
+interface WebKitEntry {
+    readonly filesystem: WebKitFileSystem;
+    readonly fullPath: string;
+    readonly isDirectory: boolean;
+    readonly isFile: boolean;
+    readonly name: string;
+}
+
+declare var WebKitEntry: {
+    prototype: WebKitEntry;
+    new(): WebKitEntry;
+}
+
+interface WebKitFileSystem {
+    readonly name: string;
+    readonly root: WebKitDirectoryEntry;
+}
+
+declare var WebKitFileSystem: {
+    prototype: WebKitFileSystem;
+    new(): WebKitFileSystem;
+}
+
 interface WebSocketEventMap {
     "close": CloseEvent;
     "error": Event;
@@ -1019,10 +1054,10 @@ interface WebSocket extends EventTarget {
     binaryType: string;
     readonly bufferedAmount: number;
     readonly extensions: string;
-    onclose: (this: WebSocket, ev: CloseEvent) => any;
-    onerror: (this: WebSocket, ev: Event) => any;
-    onmessage: (this: WebSocket, ev: MessageEvent) => any;
-    onopen: (this: WebSocket, ev: Event) => any;
+    onclose: (this: WebSocket, ev: CloseEvent<WebSocket>) => any;
+    onerror: (this: WebSocket, ev: Event<WebSocket>) => any;
+    onmessage: (this: WebSocket, ev: MessageEvent<WebSocket>) => any;
+    onopen: (this: WebSocket, ev: Event<WebSocket>) => any;
     readonly protocol: string;
     readonly readyState: number;
     readonly url: string;
@@ -1033,7 +1068,7 @@ interface WebSocket extends EventTarget {
     readonly CONNECTING: number;
     readonly OPEN: number;
     addEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<WebSocket>, useCapture?: boolean): void;
 }
 
 declare var WebSocket: {
@@ -1049,12 +1084,12 @@ interface WorkerEventMap extends AbstractWorkerEventMap {
     "message": MessageEvent;
 }
 
-interface Worker extends EventTarget, AbstractWorker {
-    onmessage: (this: Worker, ev: MessageEvent) => any;
+interface Worker extends EventTarget, AbstractWorker<Worker> {
+    onmessage: (this: Worker, ev: MessageEvent<Worker>) => any;
     postMessage(message: any, transfer?: any[]): void;
     terminate(): void;
     addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<Worker>, useCapture?: boolean): void;
 }
 
 declare var Worker: {
@@ -1066,8 +1101,8 @@ interface XMLHttpRequestEventMap extends XMLHttpRequestEventTargetEventMap {
     "readystatechange": Event;
 }
 
-interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
-    onreadystatechange: (this: XMLHttpRequest, ev: Event) => any;
+interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget<XMLHttpRequest> {
+    onreadystatechange: (this: XMLHttpRequest, ev: Event<XMLHttpRequest>) => any;
     readonly readyState: number;
     readonly response: any;
     readonly responseText: string;
@@ -1095,7 +1130,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly OPENED: number;
     readonly UNSENT: number;
     addEventListener<K extends keyof XMLHttpRequestEventMap>(type: K, listener: (this: XMLHttpRequest, ev: XMLHttpRequestEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<XMLHttpRequest>, useCapture?: boolean): void;
 }
 
 declare var XMLHttpRequest: {
@@ -1108,9 +1143,9 @@ declare var XMLHttpRequest: {
     readonly UNSENT: number;
 }
 
-interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget {
+interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget<XMLHttpRequestUpload> {
     addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestUpload, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<XMLHttpRequestUpload>, useCapture?: boolean): void;
 }
 
 declare var XMLHttpRequestUpload: {
@@ -1122,10 +1157,8 @@ interface AbstractWorkerEventMap {
     "error": ErrorEvent;
 }
 
-interface AbstractWorker {
-    onerror: (this: AbstractWorker, ev: ErrorEvent) => any;
-    addEventListener<K extends keyof AbstractWorkerEventMap>(type: K, listener: (this: AbstractWorker, ev: AbstractWorkerEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+interface AbstractWorker<T extends EventTarget<T> = EventTarget> {
+    onerror: (this: AbstractWorker, ev: ErrorEvent<T>) => any;
 }
 
 interface Body {
@@ -1149,21 +1182,19 @@ interface MSBaseReaderEventMap {
     "progress": ProgressEvent;
 }
 
-interface MSBaseReader {
-    onabort: (this: MSBaseReader, ev: Event) => any;
-    onerror: (this: MSBaseReader, ev: ErrorEvent) => any;
-    onload: (this: MSBaseReader, ev: Event) => any;
-    onloadend: (this: MSBaseReader, ev: ProgressEvent) => any;
-    onloadstart: (this: MSBaseReader, ev: Event) => any;
-    onprogress: (this: MSBaseReader, ev: ProgressEvent) => any;
+interface MSBaseReader<T extends EventTarget<T> = EventTarget> {
+    onabort: (this: MSBaseReader, ev: Event<T>) => any;
+    onerror: (this: MSBaseReader, ev: ErrorEvent<T>) => any;
+    onload: (this: MSBaseReader, ev: Event<T>) => any;
+    onloadend: (this: MSBaseReader, ev: ProgressEvent<T>) => any;
+    onloadstart: (this: MSBaseReader, ev: Event<T>) => any;
+    onprogress: (this: MSBaseReader, ev: ProgressEvent<T>) => any;
     readonly readyState: number;
     readonly result: any;
     abort(): void;
     readonly DONE: number;
     readonly EMPTY: number;
     readonly LOADING: number;
-    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 interface NavigatorBeacon {
@@ -1209,16 +1240,14 @@ interface XMLHttpRequestEventTargetEventMap {
     "timeout": ProgressEvent;
 }
 
-interface XMLHttpRequestEventTarget {
-    onabort: (this: XMLHttpRequestEventTarget, ev: Event) => any;
-    onerror: (this: XMLHttpRequestEventTarget, ev: ErrorEvent) => any;
-    onload: (this: XMLHttpRequestEventTarget, ev: Event) => any;
-    onloadend: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
-    onloadstart: (this: XMLHttpRequestEventTarget, ev: Event) => any;
-    onprogress: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
-    ontimeout: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
-    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+interface XMLHttpRequestEventTarget<T extends EventTarget<T> = EventTarget> {
+    onabort: (this: XMLHttpRequestEventTarget, ev: Event<T>) => any;
+    onerror: (this: XMLHttpRequestEventTarget, ev: ErrorEvent<T>) => any;
+    onload: (this: XMLHttpRequestEventTarget, ev: Event<T>) => any;
+    onloadend: (this: XMLHttpRequestEventTarget, ev: ProgressEvent<T>) => any;
+    onloadstart: (this: XMLHttpRequestEventTarget, ev: Event<T>) => any;
+    onprogress: (this: XMLHttpRequestEventTarget, ev: ProgressEvent<T>) => any;
+    ontimeout: (this: XMLHttpRequestEventTarget, ev: ProgressEvent<T>) => any;
 }
 
 interface Client {
@@ -1250,11 +1279,11 @@ interface DedicatedWorkerGlobalScopeEventMap extends WorkerGlobalScopeEventMap {
 }
 
 interface DedicatedWorkerGlobalScope extends WorkerGlobalScope {
-    onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any;
+    onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent<DedicatedWorkerGlobalScope>) => any;
     close(): void;
     postMessage(message: any, transfer?: any[]): void;
     addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<DedicatedWorkerGlobalScope>, useCapture?: boolean): void;
 }
 
 declare var DedicatedWorkerGlobalScope: {
@@ -1262,7 +1291,7 @@ declare var DedicatedWorkerGlobalScope: {
     new(): DedicatedWorkerGlobalScope;
 }
 
-interface ExtendableEvent extends Event {
+interface ExtendableEvent<T extends EventTarget<T> = EventTarget> extends Event<T> {
     waitUntil(f: Promise<any>): void;
 }
 
@@ -1271,7 +1300,7 @@ declare var ExtendableEvent: {
     new(type: string, eventInitDict?: ExtendableEventInit): ExtendableEvent;
 }
 
-interface ExtendableMessageEvent extends ExtendableEvent {
+interface ExtendableMessageEvent<T extends EventTarget<T> = EventTarget> extends ExtendableEvent<T> {
     readonly data: any;
     readonly lastEventId: string;
     readonly origin: string;
@@ -1284,7 +1313,7 @@ declare var ExtendableMessageEvent: {
     new(type: string, eventInitDict?: ExtendableMessageEventInit): ExtendableMessageEvent;
 }
 
-interface FetchEvent extends ExtendableEvent {
+interface FetchEvent<T extends EventTarget<T> = EventTarget> extends ExtendableEvent<T> {
     readonly clientId: string | null;
     readonly isReload: boolean;
     readonly request: Request;
@@ -1308,7 +1337,7 @@ declare var FileReaderSync: {
     new(): FileReaderSync;
 }
 
-interface NotificationEvent extends ExtendableEvent {
+interface NotificationEvent<T extends EventTarget<T> = EventTarget> extends ExtendableEvent<T> {
     readonly action: string;
     readonly notification: Notification;
 }
@@ -1318,7 +1347,7 @@ declare var NotificationEvent: {
     new(type: string, eventInitDict: NotificationEventInit): NotificationEvent;
 }
 
-interface PushEvent extends ExtendableEvent {
+interface PushEvent<T extends EventTarget<T> = EventTarget> extends ExtendableEvent<T> {
     readonly data: PushMessageData | null;
 }
 
@@ -1353,19 +1382,19 @@ interface ServiceWorkerGlobalScopeEventMap extends WorkerGlobalScopeEventMap {
 
 interface ServiceWorkerGlobalScope extends WorkerGlobalScope {
     readonly clients: Clients;
-    onactivate: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent) => any;
-    onfetch: (this: ServiceWorkerGlobalScope, ev: FetchEvent) => any;
-    oninstall: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent) => any;
-    onmessage: (this: ServiceWorkerGlobalScope, ev: ExtendableMessageEvent) => any;
-    onnotificationclick: (this: ServiceWorkerGlobalScope, ev: NotificationEvent) => any;
-    onnotificationclose: (this: ServiceWorkerGlobalScope, ev: NotificationEvent) => any;
-    onpush: (this: ServiceWorkerGlobalScope, ev: PushEvent) => any;
-    onpushsubscriptionchange: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent) => any;
-    onsync: (this: ServiceWorkerGlobalScope, ev: SyncEvent) => any;
+    onactivate: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent<ServiceWorkerGlobalScope>) => any;
+    onfetch: (this: ServiceWorkerGlobalScope, ev: FetchEvent<ServiceWorkerGlobalScope>) => any;
+    oninstall: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent<ServiceWorkerGlobalScope>) => any;
+    onmessage: (this: ServiceWorkerGlobalScope, ev: ExtendableMessageEvent<ServiceWorkerGlobalScope>) => any;
+    onnotificationclick: (this: ServiceWorkerGlobalScope, ev: NotificationEvent<ServiceWorkerGlobalScope>) => any;
+    onnotificationclose: (this: ServiceWorkerGlobalScope, ev: NotificationEvent<ServiceWorkerGlobalScope>) => any;
+    onpush: (this: ServiceWorkerGlobalScope, ev: PushEvent<ServiceWorkerGlobalScope>) => any;
+    onpushsubscriptionchange: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent<ServiceWorkerGlobalScope>) => any;
+    onsync: (this: ServiceWorkerGlobalScope, ev: SyncEvent<ServiceWorkerGlobalScope>) => any;
     readonly registration: ServiceWorkerRegistration;
     skipWaiting(): Promise<void>;
     addEventListener<K extends keyof ServiceWorkerGlobalScopeEventMap>(type: K, listener: (this: ServiceWorkerGlobalScope, ev: ServiceWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<ServiceWorkerGlobalScope>, useCapture?: boolean): void;
 }
 
 declare var ServiceWorkerGlobalScope: {
@@ -1373,7 +1402,7 @@ declare var ServiceWorkerGlobalScope: {
     new(): ServiceWorkerGlobalScope;
 }
 
-interface SyncEvent extends ExtendableEvent {
+interface SyncEvent<T extends EventTarget<T> = EventTarget> extends ExtendableEvent<T> {
     readonly lastChance: boolean;
     readonly tag: string;
 }
@@ -1403,14 +1432,14 @@ interface WorkerGlobalScope extends EventTarget, WorkerUtils, WindowConsole, Glo
     readonly caches: CacheStorage;
     readonly isSecureContext: boolean;
     readonly location: WorkerLocation;
-    onerror: (this: WorkerGlobalScope, ev: ErrorEvent) => any;
+    onerror: (this: WorkerGlobalScope, ev: ErrorEvent<WorkerGlobalScope>) => any;
     readonly performance: Performance;
     readonly self: WorkerGlobalScope;
     msWriteProfilerMark(profilerMarkName: string): void;
     createImageBitmap(image: ImageBitmap | ImageData | Blob, options?: ImageBitmapOptions): Promise<ImageBitmap>;
     createImageBitmap(image: ImageBitmap | ImageData | Blob, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
     addEventListener<K extends keyof WorkerGlobalScopeEventMap>(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject<WorkerGlobalScope>, useCapture?: boolean): void;
 }
 
 declare var WorkerGlobalScope: {
@@ -1469,6 +1498,12 @@ interface ErrorEventInit {
     error?: any;
 }
 
+interface EventTarget<T = any> {
+    addEventListener(type: string, listener?: EventListenerOrEventListenerObject<EventTarget<T>>, useCapture?: boolean): void;
+    dispatchEvent(evt: Event): boolean;
+    removeEventListener(type: string, listener?: EventListenerOrEventListenerObject<EventTarget<T>>, useCapture?: boolean): void;
+}
+
 interface ImageBitmapOptions {
     imageOrientation?: "none" | "flipY";
     premultiplyAlpha?: "none" | "premultiply" | "default";
@@ -1494,8 +1529,8 @@ interface FilePropertyBag {
     lastModified?: number;
 }
 
-interface EventListenerObject {
-    handleEvent(evt: Event): void;
+interface EventListenerObject<T extends EventTarget> {
+    handleEvent(evt: Event<T>): void;
 }
 
 interface ProgressEventInit extends EventInit {
@@ -1678,7 +1713,7 @@ interface JsonWebKey {
     k?: string;
 }
 
-declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
+declare type EventListenerOrEventListenerObject<T extends EventTarget<T>> = EventListener<T> | EventListenerObject<T>;
 
 interface ErrorEventHandler {
     (message: string, filename?: string, lineno?: number, colno?: number, error?:Error): void;
@@ -1704,20 +1739,20 @@ interface ForEachCallback {
 interface NotificationPermissionCallback {
     (permission: string): void;
 }
-declare var onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any;
+declare var onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent<DedicatedWorkerGlobalScope>) => any;
 declare function close(): void;
 declare function postMessage(message: any, transfer?: any[]): void;
 declare var caches: CacheStorage;
 declare var isSecureContext: boolean;
 declare var location: WorkerLocation;
-declare var onerror: (this: DedicatedWorkerGlobalScope, ev: ErrorEvent) => any;
+declare var onerror: (this: DedicatedWorkerGlobalScope, ev: ErrorEvent<DedicatedWorkerGlobalScope>) => any;
 declare var performance: Performance;
 declare var self: WorkerGlobalScope;
 declare function msWriteProfilerMark(profilerMarkName: string): void;
 declare function createImageBitmap(image: ImageBitmap | ImageData | Blob, options?: ImageBitmapOptions): Promise<ImageBitmap>;
 declare function createImageBitmap(image: ImageBitmap | ImageData | Blob, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
 declare function dispatchEvent(evt: Event): boolean;
-declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject<DedicatedWorkerGlobalScope>, useCapture?: boolean): void;
 declare var indexedDB: IDBFactory;
 declare var msIndexedDB: IDBFactory;
 declare var navigator: WorkerNavigator;
@@ -1736,9 +1771,9 @@ declare function btoa(rawString: string): string;
 declare var console: Console;
 declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
 declare function dispatchEvent(evt: Event): boolean;
-declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject<DedicatedWorkerGlobalScope>, useCapture?: boolean): void;
 declare function addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject<DedicatedWorkerGlobalScope>, useCapture?: boolean): void;
 type AlgorithmIdentifier = string | Algorithm;
 type BodyInit = any;
 type IDBKeyPath = string;
diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json
index 6e7648f85..7852f2b77 100644
--- a/inputfiles/addedTypes.json
+++ b/inputfiles/addedTypes.json
@@ -25,6 +25,24 @@
             }
         ]
     },
+    {
+        "kind": "interface",
+        "name": "EventTarget<T = any>",
+        "methods": [
+            {
+                "name": "addEventListener",
+                "signatures": ["addEventListener(type: string, listener?: EventListenerOrEventListenerObject<EventTarget<T>>, useCapture?: boolean): void"]
+            },
+            {
+                "name": "dispatchEvent",
+                "signatures": ["dispatchEvent(evt: Event): boolean"]
+            },
+            {
+                "name": "removeEventListener",
+                "signatures": ["removeEventListener(type: string, listener?: EventListenerOrEventListenerObject<EventTarget<T>>, useCapture?: boolean): void"]
+            }
+        ]
+    },
     {
         "kind": "property",
         "interface": "CSSStyleDeclaration",
@@ -302,11 +320,11 @@
     },
     {
         "kind": "interface",
-        "name": "EventListenerObject",
+        "name": "EventListenerObject<T extends EventTarget>",
         "methods": [
             {
                 "name": "handleEvent",
-                "signatures": ["handleEvent(evt: Event): void"]
+                "signatures": ["handleEvent(evt: Event<T>): void"]
             }
         ]
     },
diff --git a/inputfiles/knownWorkerInterfaces.json b/inputfiles/knownWorkerInterfaces.json
index a56aea3ed..4690060ef 100644
--- a/inputfiles/knownWorkerInterfaces.json
+++ b/inputfiles/knownWorkerInterfaces.json
@@ -92,6 +92,10 @@
     "SyncManager",
     "USVString",
     "WebSocket",
+    "WebKitDirectoryEntry",
+    "WebKitDirectoryReader",
+    "WebKitEntry",
+    "WebKitFileSystem",
     "WindowBase64",
     "WindowConsole",
     "Worker",
diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json
index 9f8ed20e1..082d50dec 100644
--- a/inputfiles/overridingTypes.json
+++ b/inputfiles/overridingTypes.json
@@ -1006,5 +1006,19 @@
         "interface": "DOMImplementation",
         "name": "createDocument",
         "signatures": ["createDocument(namespaceURI: string | null, qualifiedName: string | null, doctype: DocumentType | null): Document"]
+    },
+    {
+        "kind": "property",
+        "interface": "Event",
+        "name": "currentTarget",
+        "readonly": true,
+        "type": "T"
+    },
+    {
+        "kind": "property",
+        "interface": "Event",
+        "name": "target",
+        "readonly": true,
+        "type": "T"
     }
  ]
diff --git a/inputfiles/removedTypes.json b/inputfiles/removedTypes.json
index 9168ace44..f0efca4cb 100644
--- a/inputfiles/removedTypes.json
+++ b/inputfiles/removedTypes.json
@@ -77,5 +77,9 @@
     {
         "kind": "typedef",
         "name": "JSON"
+    },
+    {
+        "kind": "interface",
+        "name": "EventTarget"
     }
 ]