diff --git a/keymap/vim.js b/keymap/vim.js
index 789e1e55b3..c413414f66 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -34,14 +34,7 @@
  *  9. Ex command implementations.
  */
 
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"), require("../addon/edit/matchbrackets.js"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog", "../addon/edit/matchbrackets"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
+export function vimMode(CodeMirror) {
   'use strict';
 
   var defaultKeymap = [
@@ -5712,4 +5705,4 @@
   };
   // Initialize Vim and make it available as an API.
   CodeMirror.Vim = Vim();
-});
+};
diff --git a/mode/toml/toml.js b/mode/toml/toml.js
index 891f384b5b..1301f666b4 100644
--- a/mode/toml/toml.js
+++ b/mode/toml/toml.js
@@ -1,88 +1,80 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: https://codemirror.net/LICENSE
 
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
+export  function tomlMode(CodeMirror) {
+    "use strict";
 
-CodeMirror.defineMode("toml", function () {
-  return {
-    startState: function () {
+    CodeMirror.defineMode("toml", function () {
       return {
-        inString: false,
-        stringType: "",
-        lhs: true,
-        inArray: 0
-      };
-    },
-    token: function (stream, state) {
-      //check for state changes
-      if (!state.inString && ((stream.peek() == '"') || (stream.peek() == "'"))) {
-        state.stringType = stream.peek();
-        stream.next(); // Skip quote
-        state.inString = true; // Update state
-      }
-      if (stream.sol() && state.inArray === 0) {
-        state.lhs = true;
-      }
-      //return state
-      if (state.inString) {
-        while (state.inString && !stream.eol()) {
-          if (stream.peek() === state.stringType) {
+        startState: function () {
+          return {
+            inString: false,
+            stringType: "",
+            lhs: true,
+            inArray: 0
+          };
+        },
+        token: function (stream, state) {
+          //check for state changes
+          if (!state.inString && ((stream.peek() == '"') || (stream.peek() == "'"))) {
+            state.stringType = stream.peek();
             stream.next(); // Skip quote
-            state.inString = false; // Clear flag
-          } else if (stream.peek() === '\\') {
+            state.inString = true; // Update state
+          }
+          if (stream.sol() && state.inArray === 0) {
+            state.lhs = true;
+          }
+          //return state
+          if (state.inString) {
+            while (state.inString && !stream.eol()) {
+              if (stream.peek() === state.stringType) {
+                stream.next(); // Skip quote
+                state.inString = false; // Clear flag
+              } else if (stream.peek() === '\\') {
+                stream.next();
+                stream.next();
+              } else {
+                stream.match(/^.[^\\\"\']*/);
+              }
+            }
+            return state.lhs ? "property string" : "string"; // Token style
+          } else if (state.inArray && stream.peek() === ']') {
+            stream.next();
+            state.inArray--;
+            return 'bracket';
+          } else if (state.lhs && stream.peek() === '[' && stream.skipTo(']')) {
+            stream.next();//skip closing ]
+            // array of objects has an extra open & close []
+            if (stream.peek() === ']') stream.next();
+            return "atom";
+          } else if (stream.peek() === "#") {
+            stream.skipToEnd();
+            return "comment";
+          } else if (stream.eatSpace()) {
+            return null;
+          } else if (state.lhs && stream.eatWhile(function (c) { return c != '=' && c != ' '; })) {
+            return "property";
+          } else if (state.lhs && stream.peek() === "=") {
             stream.next();
+            state.lhs = false;
+            return null;
+          } else if (!state.lhs && stream.match(/^\d\d\d\d[\d\-\:\.T]*Z/)) {
+            return 'atom'; //date
+          } else if (!state.lhs && (stream.match('true') || stream.match('false'))) {
+            return 'atom';
+          } else if (!state.lhs && stream.peek() === '[') {
+            state.inArray++;
+            stream.next();
+            return 'bracket';
+          } else if (!state.lhs && stream.match(/^\-?\d+(?:\.\d+)?/)) {
+            return 'number';
+          } else if (!stream.eatSpace()) {
             stream.next();
-          } else {
-            stream.match(/^.[^\\\"\']*/);
           }
+          return null;
         }
-        return state.lhs ? "property string" : "string"; // Token style
-      } else if (state.inArray && stream.peek() === ']') {
-        stream.next();
-        state.inArray--;
-        return 'bracket';
-      } else if (state.lhs && stream.peek() === '[' && stream.skipTo(']')) {
-        stream.next();//skip closing ]
-        // array of objects has an extra open & close []
-        if (stream.peek() === ']') stream.next();
-        return "atom";
-      } else if (stream.peek() === "#") {
-        stream.skipToEnd();
-        return "comment";
-      } else if (stream.eatSpace()) {
-        return null;
-      } else if (state.lhs && stream.eatWhile(function (c) { return c != '=' && c != ' '; })) {
-        return "property";
-      } else if (state.lhs && stream.peek() === "=") {
-        stream.next();
-        state.lhs = false;
-        return null;
-      } else if (!state.lhs && stream.match(/^\d\d\d\d[\d\-\:\.T]*Z/)) {
-        return 'atom'; //date
-      } else if (!state.lhs && (stream.match('true') || stream.match('false'))) {
-        return 'atom';
-      } else if (!state.lhs && stream.peek() === '[') {
-        state.inArray++;
-        stream.next();
-        return 'bracket';
-      } else if (!state.lhs && stream.match(/^\-?\d+(?:\.\d+)?/)) {
-        return 'number';
-      } else if (!stream.eatSpace()) {
-        stream.next();
-      }
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME('text/x-toml', 'toml');
+      };
+    });
 
-});
+    CodeMirror.defineMIME('text/x-toml', 'toml');
+};