diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index 1ac98948..56b2d8be 100644
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -1319,7 +1319,6 @@ export class InputHandler extends Disposable implements IInputHandler {
           break;
         case 1000: // vt200 mouse
           // no motion.
-          // no modifiers, except control on the wheel.
           this._coreMouseService.activeProtocol = 'VT200';
           break;
         case 1002: // button event mouse
@@ -1336,23 +1335,15 @@ export class InputHandler extends Disposable implements IInputHandler {
           this._terminal.sendFocus = true;
           break;
         case 1005: // utf8 ext mode mouse
-          this._coreMouseService.activeEncoding = 'UTF8';
           // for wide terminals
           // simply encodes large values as utf8 characters
+          this._coreMouseService.activeEncoding = 'UTF8';
           break;
         case 1006: // sgr ext mode mouse
           this._coreMouseService.activeEncoding = 'SGR';
-          // for wide terminals
-          // does not add 32 to fields
-          // press: ^[[<b;x;yM
-          // release: ^[[<b;x;ym
           break;
         case 1015: // urxvt ext mode mouse
           this._coreMouseService.activeEncoding = 'URXVT';
-          // for wide terminals
-          // numbers for fields
-          // press: ^[[b;x;yM
-          // motion: ^[[b;x;yT
           break;
         case 25: // show cursor
           this._terminal.cursorHidden = false;
diff --git a/src/Terminal.ts b/src/Terminal.ts
index 63a90052..a44e5afe 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -809,13 +809,13 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
      * Note: 'mousedown' currently is "always on" and not managed
      * by onProtocolChange.
      */
-    const requestedEvents: {[key: string]: any} = {
+    const requestedEvents: {[key: string]: ((ev: Event) => void) | null} = {
       mouseup: null,
       wheel: null,
       mousedrag: null,
       mousemove: null
     };
-    const eventListeners: {[key: string]: any} = {
+    const eventListeners: {[key: string]: (ev: Event) => void} = {
       mouseup: (ev: MouseEvent) => {
         sendEvent(ev);
         if (!ev.buttons) {