diff --git a/.eslintrc.json b/.eslintrc.json
index 52f1a5277f..e9898abf46 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -15,8 +15,7 @@
 		"mw": false
 	},
 	"rules": {
-		"dot-notation": 0,
-		"wrap-iife": 0,
+		"dot-notation": [ "error", { "allowKeywords": true } ],
 		"valid-jsdoc": 0,
 		"no-alert": "error"
 	}
diff --git a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
index d72c3776f2..9b8f310a11 100644
--- a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
+++ b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
@@ -149,4 +149,4 @@
 		mw.track( topic, data.duration );
 	} );
 
-} )();
+}() );
diff --git a/modules/ve-mw/tests/ve.test.utils.js b/modules/ve-mw/tests/ve.test.utils.js
index ee0e0cee65..58171dae4d 100644
--- a/modules/ve-mw/tests/ve.test.utils.js
+++ b/modules/ve-mw/tests/ve.test.utils.js
@@ -85,7 +85,7 @@ ve.test.utils.mwEnvironment = ( function () {
 		setup: setupOverrides,
 		teardown: teardownOverrides
 	} );
-} )();
+}() );
 
 ( function () {
 	var getDomElementSummaryCore = ve.getDomElementSummary;
@@ -112,4 +112,4 @@ ve.test.utils.mwEnvironment = ( function () {
 			return value;
 		} );
 	};
-} )();
+}() );
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
index 2dacec5e82..f0e78e259f 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
@@ -48,4 +48,4 @@ ve.ui.windowFactory.register( ve.ui.MWCommandHelpDialog );
 			demote: true
 		} );
 	}
-} )();
+}() );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWFormatTool.js b/modules/ve-mw/ui/tools/ve.ui.MWFormatTool.js
index 85ec39fe09..ac2d2bfadc 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWFormatTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWFormatTool.js
@@ -123,7 +123,7 @@ ve.ui.toolFactory.register( ve.ui.MWHeading6FormatTool );
 			)
 		);
 	}
-} )();
+}() );
 
 /**
  * MediaWiki UserInterface preformatted tool.
diff --git a/modules/ve-mw/ui/ve.ui.MWSequenceRegistry.js b/modules/ve-mw/ui/ve.ui.MWSequenceRegistry.js
index 5339cf57db..116ee1b35b 100644
--- a/modules/ve-mw/ui/ve.ui.MWSequenceRegistry.js
+++ b/modules/ve-mw/ui/ve.ui.MWSequenceRegistry.js
@@ -24,7 +24,7 @@ ve.ui.sequenceRegistry.register(
 			)
 		);
 	}
-} )();
+}() );
 ve.ui.sequenceRegistry.register(
 	new ve.ui.Sequence( 'numberHash', 'numberWrapOnce', [ { type: 'paragraph' }, '#', ' ' ], 2 )
 );
diff --git a/modules/ve-mw/ui/ve.ui.MWWikitextCommandRegistry.js b/modules/ve-mw/ui/ve.ui.MWWikitextCommandRegistry.js
index 1814a4a7fd..67ea9ad3ed 100644
--- a/modules/ve-mw/ui/ve.ui.MWWikitextCommandRegistry.js
+++ b/modules/ve-mw/ui/ve.ui.MWWikitextCommandRegistry.js
@@ -207,7 +207,7 @@ ve.ui.wikitextCommandRegistry.register(
 		)
 	);
 
-} )();
+}() );
 
 ve.ui.wikitextCommandRegistry.register(
 	new ve.ui.Command(