diff --git a/.jsdoc.json b/.jsdoc.json
index d0ba87ce89..56eb4ce826 100644
--- a/.jsdoc.json
+++ b/.jsdoc.json
@@ -46,8 +46,6 @@
 				"mw.libs.ve."
 			],
 			"linkMap": {
-				"Mixed": "#",
-
 				"VisualEditorOverlay": "https://doc.wikimedia.org/MobileFrontend/master/js/js/VisualEditorOverlay.html",
 
 				"Array": "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array",
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWGalleryNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWGalleryNode.js
index 627d1de20c..7c2f5e2928 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWGalleryNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWGalleryNode.js
@@ -99,8 +99,8 @@ ve.ce.MWGalleryNode.prototype.onUpdate = function () {
  * Handle attribute changes to keep the live HTML element updated.
  *
  * @param {string} key Attribute name
- * @param {Mixed} from Old value
- * @param {Mixed} to New value
+ * @param {any} from Old value
+ * @param {any} to New value
  */
 ve.ce.MWGalleryNode.prototype.onAttributeChange = function ( key, from, to ) {
 	var defaults = mw.config.get( 'wgVisualEditorConfig' ).galleryOptions;
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index eb326991a0..47152de667 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -231,7 +231,7 @@ ve.init.mw.DesktopArticleTarget.prototype.setContainer = function ( $container )
 /**
  * Verify that a PopStateEvent correlates to a state we created.
  *
- * @param {Mixed} popState From PopStateEvent#state
+ * @param {any} popState From PopStateEvent#state
  * @return {boolean}
  */
 ve.init.mw.DesktopArticleTarget.prototype.verifyPopState = function ( popState ) {
diff --git a/modules/ve-mw/ui/ve.ui.MWWikitextCommandRegistry.js b/modules/ve-mw/ui/ve.ui.MWWikitextCommandRegistry.js
index 799c19e4a4..437d78cb4e 100644
--- a/modules/ve-mw/ui/ve.ui.MWWikitextCommandRegistry.js
+++ b/modules/ve-mw/ui/ve.ui.MWWikitextCommandRegistry.js
@@ -31,7 +31,7 @@ OO.inheritClass( ve.ui.MWWikitextCommandRegistry, ve.ui.CommandRegistry );
  * See https://doc.wikimedia.org/oojs/master/OO.Registry.html
  *
  * @param {string} name Symbolic name
- * @return {Mixed|undefined} Data associated with symbolic name
+ * @return {any|undefined} Data associated with symbolic name
  */
 ve.ui.MWWikitextCommandRegistry.prototype.lookup = function ( name ) {
 	// Parent method
diff --git a/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js b/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js
index 5d5ea5555b..8154d96065 100644
--- a/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js
+++ b/modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js
@@ -41,7 +41,7 @@ OO.inheritClass( ve.ui.MWWikitextDataTransferHandlerFactory, ve.ui.DataTransferH
  * See https://doc.wikimedia.org/oojs/master/OO.Factory.html
  *
  * @param {string} name Object name
- * @param {...Mixed} [args] Arguments to pass to the constructor
+ * @param {...any} [args] Arguments to pass to the constructor
  * @return {Object} The new object
  * @throws {Error} Unknown object name
  */