diff --git a/jquery/client.d.ts b/jquery/client.d.ts
index 6f5fb73..20c6dc6 100644
--- a/jquery/client.d.ts
+++ b/jquery/client.d.ts
@@ -2,6 +2,8 @@ declare global {
     interface JQueryStatic {
         /**
          * User-agent detection
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.client
          */
         client: Client;
     }
@@ -74,9 +76,10 @@ interface Client {
      * - `solaris` (untested)
      * - `win`
      *
-     * @param {Object} [nav] An object with a 'userAgent' and 'platform' property.
+     * @param {ClientNavigator} [nav] An object with a 'userAgent' and 'platform' property.
      *  Defaults to the global `navigator` object.
-     * @return {Object} The client object
+     * @returns {ClientProfile} The client object
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.client-method-profile
      */
     profile(nav?: ClientNavigator): ClientProfile;
 
@@ -117,10 +120,11 @@ interface Client {
      * ```
      *
      * @param {Object} map Browser support map
-     * @param {Object} [profile] A client-profile object
+     * @param {ClientProfile} [profile] A client-profile object
      * @param {boolean} [exactMatchOnly=false] Only return true if the browser is matched,
      *  otherwise returns true if the browser is not found.
-     * @return {boolean} The current browser is in the support map
+     * @returns {boolean} The current browser is in the support map
+     * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.client-method-test
      */
     test(
         map: ClientSupportMap | { ltr: ClientSupportMap; rtl: ClientSupportMap },
diff --git a/jquery/colorUtil.d.ts b/jquery/colorUtil.d.ts
index 1f7d2e0..e7b94a6 100644
--- a/jquery/colorUtil.d.ts
+++ b/jquery/colorUtil.d.ts
@@ -12,7 +12,7 @@ interface ColorUtil {
      * <http://jquery.offput.ca/highlightFade/>
      *
      * @param {Array|string} color
-     * @return {Array}
+     * @returns {Array}
      */
     getRGB(color: string | number[]): number[];
 
@@ -21,8 +21,6 @@ interface ColorUtil {
      *
      * Based on Interface by Stefan Petre
      * <http://interface.eyecon.ro/>
-     *
-     * @property {Object}
      */
     colors: Record<string, [number, number, number]>;
 
@@ -40,7 +38,7 @@ interface ColorUtil {
      * @param {number} r The red color value
      * @param {number} g The green color value
      * @param {number} b The blue color value
-     * @return {number[]} The HSL representation
+     * @returns {number[]} The HSL representation
      */
     rgbToHsl(r: number, g: number, b: number): number[];
 
@@ -58,7 +56,7 @@ interface ColorUtil {
      * @param {number} h The hue
      * @param {number} s The saturation
      * @param {number} l The lightness
-     * @return {number[]} The RGB representation
+     * @returns {number[]} The RGB representation
      */
     hslToRgb(h: number, s: number, l: number): number[];
 
@@ -76,7 +74,7 @@ interface ColorUtil {
      *
      * @param {Mixed} currentColor Current value in css
      * @param {number} mod Wanted brightness modification between -1 and 1
-     * @return {string} Like `'rgb(r,g,b)'`
+     * @returns {string} Like `'rgb(r,g,b)'`
      */
     getColorBrightness(currentColor: any, mod: number): `rgb(${number},${number},${number})`;
 }
diff --git a/jquery/textSelection.d.ts b/jquery/textSelection.d.ts
index 6635b86..93d24c5 100644
--- a/jquery/textSelection.d.ts
+++ b/jquery/textSelection.d.ts
@@ -4,7 +4,8 @@ declare global {
          * Get the contents of the textarea.
          *
          * @param {string} command Command to execute
-         * @return {string}
+         * @returns {string}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(command: "getContents"): string;
 
@@ -13,8 +14,8 @@ declare global {
          *
          * @param {string} command Command to execute
          * @param {string} content
-         * @return {JQuery}
-         * @chainable
+         * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(command: "setContents", content: string): this;
 
@@ -22,7 +23,8 @@ declare global {
          * Get the currently selected text in this textarea.
          *
          * @param {string} command Command to execute
-         * @return {string}
+         * @returns {string}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(command: "getSelection"): string;
 
@@ -31,8 +33,8 @@ declare global {
          *
          * @param {string} command Command to execute
          * @param {string} value
-         * @return {JQuery}
-         * @chainable
+         * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(command: "replaceSelection", value: string): this;
 
@@ -43,9 +45,9 @@ declare global {
          * Also focusses the textarea.
          *
          * @param {string} command Command to execute
-         * @param {Object} [options]
-         * @return {JQuery}
-         * @chainable
+         * @param {TextSelectionEncapsulateOptions} [options]
+         * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(
             command: "encapsulateSelection",
@@ -57,8 +59,9 @@ declare global {
          *
          * @param {string} command Command to execute
          * @param {Object} [options]
-         * @param {Object} [options.startAndEnd=false] Return range of the selection rather than just start
-         * @return {Array} Array with two numbers, for start and end of selection
+         * @param {boolean} [options.startAndEnd=false] Return range of the selection rather than just start
+         * @returns {number[]} Array with two numbers, for start and end of selection
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(
             command: "getCaretPosition",
@@ -70,8 +73,9 @@ declare global {
          *
          * @param {string} command Command to execute
          * @param {Object} [options]
-         * @param {Object} [options.startAndEnd=false] Return range of the selection rather than just start
-         * @return {number}
+         * @param {boolean} [options.startAndEnd=false] Return range of the selection rather than just start
+         * @returns {number}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(command: "getCaretPosition", options?: { startAndEnd?: false }): number;
 
@@ -82,8 +86,8 @@ declare global {
          * @param {Object} options
          * @param {number} options.start
          * @param {number} [options.end=options.start]
-         * @return {JQuery}
-         * @chainable
+         * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(command: "setSelection", options: { start: number; end?: number }): this;
 
@@ -93,10 +97,10 @@ declare global {
          *
          * @param {string} command Command to execute
          * @param {Object} [options]
-         * @param {string} [options.force=false] Whether to force a scroll even if the caret position
+         * @param {boolean} [options.force=false] Whether to force a scroll even if the caret position
          *  is already visible.
-         * @return {JQuery}
-         * @chainable
+         * @returns {JQuery}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(command: "scrollToCaretPosition", options: { force?: boolean }): this;
 
@@ -104,9 +108,10 @@ declare global {
          * Register an alternative textSelection API for this element.
          *
          * @param {string} command Command to execute
-         * @param {Object} functions Functions to replace. Keys are command names (as in {@link textSelection},
+         * @param {Object.<string, Function>} functions Functions to replace. Keys are command names (as in {@link textSelection},
          *  except 'register' and 'unregister'). Values are functions to execute when a given command is
          *  called.
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(
             command: "register",
@@ -117,6 +122,7 @@ declare global {
          * Unregister the alternative textSelection API for this element (see 'register').
          *
          * @param {string} command Command to execute
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(command: "unregister"): void;
 
@@ -125,7 +131,8 @@ declare global {
          *
          * @param {string} command Command to execute
          * @param {Mixed} [commandOptions] Options to pass to the command
-         * @return {Mixed} Depending on the command
+         * @returns {Mixed} Depending on the command
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/jQuery.plugin.textSelection-method-textSelection
          */
         textSelection(command: string, commandOptions?: any): void;
     }
diff --git a/mw/Api.d.ts b/mw/Api.d.ts
index a53af3e..5154ba2 100644
--- a/mw/Api.d.ts
+++ b/mw/Api.d.ts
@@ -5,9 +5,9 @@ import {
     ApiRollbackParams,
     ApiUploadParams,
 } from "../api_params";
+import { TitleLike } from "./Title";
 import { UserInfo } from "./user";
 
-type TitleLike = string | mw.Title;
 type TitleLikeArray = string[] | mw.Title[]; // TitleLike[] would be a mixed array
 type ApiParams = Record<string, string | string[] | boolean | number | number[]>;
 type ApiResponse = Record<string, any>; // it will always be a JSON object, the rest is uncertain ...
@@ -72,15 +72,11 @@ declare global {
              */
             constructor(options?: ApiOptions);
 
-            /**
-             * @private
-             */
-            defaults: ApiOptions;
+            private defaults: ApiOptions;
 
             /**
              * Abort all unfinished requests issued by this Api object.
              *
-             * @returns {void}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-abort
              */
             abort(): void;
@@ -114,10 +110,8 @@ declare global {
             /**
              * Massage parameters from the nice format we accept into a format suitable for the API.
              *
-             * @private
              * @param {ApiParams} parameters (modified in-place)
              * @param {boolean} useUS Whether to use U+001F when joining multi-valued parameters.
-             * @returns {void}
              */
             private preprocessParameters(parameters: ApiParams, useUS: boolean): void;
 
@@ -164,7 +158,7 @@ declare global {
              * Get a token for a certain action from the API.
              *
              * @param {string} type Token type
-             * @param {ApiParams | string} [additionalParams] Additional parameters for the API (since 1.35). When given a string, it's treated as the `assert` parameter (since 1.25)
+             * @param {ApiParams|string} [additionalParams] Additional parameters for the API (since 1.35). When given a string, it's treated as the `assert` parameter (since 1.25)
              * @returns {JQuery.Promise<string>} Received token
              * @since 1.22
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-getToken
@@ -179,7 +173,6 @@ declare global {
              * automatically.
              *
              * @param {string} type Token type
-             * @returns {void}
              * @since 1.26
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-badToken
              */
@@ -217,7 +210,7 @@ declare global {
              * } );
              * ```
              *
-             * @param {Object} data API response indicating an error
+             * @param {ApiResponse} data API response indicating an error
              * @returns {JQuery} Error messages, each wrapped in a `<div>`
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api-method-getErrorMessage
              */
@@ -324,7 +317,7 @@ declare global {
              * ```
              *
              * @param {TitleLike} title Page title
-             * @param {(data: { timestamp: string, content: string }) => string | ApiEditPageParams} transform Callback that prepares the edit
+             * @param {function({ timestamp: string, content: string }):string|ApiEditPageParams} transform Callback that prepares the edit
              * @returns {JQuery.Promise<any>}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.edit-method-edit
              */
@@ -516,10 +509,10 @@ declare global {
              * Get the categories that a particular page on the wiki belongs to.
              *
              * @param {TitleLike} title
-             * @returns {JQuery.Promise<false | mw.Title[]>} List of category titles or false if title was not found
+             * @returns {JQuery.Promise<false|Title[]>} List of category titles or false if title was not found
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.category-method-getCategories
              */
-            getCategories(title: TitleLike): JQuery.Promise<false | mw.Title[]>;
+            getCategories(title: TitleLike): JQuery.Promise<false | Title[]>;
 
             /**
              * Convenience method for `action=rollback`.
@@ -558,7 +551,7 @@ declare global {
              *
              * This function will return a promise that will resolve with a function to finish the stash upload.
              *
-             * @param {File | HTMLInputElement} file
+             * @param {File|HTMLInputElement} file
              * @param {ApiUploadParams} [data]
              * @param {number} [chunkSize] Size (in bytes) per chunk (default: 5MB)
              * @param {number} [chunkRetries] Amount of times to retry a failed chunk (default: 1)
@@ -577,9 +570,9 @@ declare global {
              *
              * The file will be uploaded using AJAX and FormData.
              *
-             * @param {HTMLInputElement | File | Blob} file HTML `input type=file` element with a file already inside of it, or a File object.
+             * @param {File|Blob|HTMLInputElement} file HTML `input type=file` element with a file already inside of it, or a File object.
              * @param {ApiUploadParams} data Other upload options, see `action=upload` API docs for more
-             * @return {JQuery.Promise<ApiResponse>}
+             * @returns {JQuery.Promise<ApiResponse>}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.upload-method-upload
              */
             upload(
@@ -613,9 +606,8 @@ declare global {
              * } );
              * ```
              *
-             * @param {File | HTMLInputElement} file
+             * @param {File|HTMLInputElement} file
              * @param {ApiUploadParams} [data]
-             * @return {JQuery.Promise}
              * @returns {JQuery.Promise<(data?: ApiUploadParams) => JQuery.Promise<ApiResponse>>} Call this function to finish the upload
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Api.plugin.upload-method-uploadToStash
              */
diff --git a/mw/ForeignApi.d.ts b/mw/ForeignApi.d.ts
index 321c5d6..4577a2c 100644
--- a/mw/ForeignApi.d.ts
+++ b/mw/ForeignApi.d.ts
@@ -49,7 +49,7 @@ declare global {
              * Return the origin to use for API requests, in the required format (protocol, host and port, if any).
              *
              * @protected
-             * @return {string | undefined}
+             * @returns {string|undefined}
              */
             protected getOrigin(): string | undefined;
         }
diff --git a/mw/ForeignRest.d.ts b/mw/ForeignRest.d.ts
index d1624af..7638b36 100644
--- a/mw/ForeignRest.d.ts
+++ b/mw/ForeignRest.d.ts
@@ -44,7 +44,7 @@ declare global {
              * @param {string | Uri} url URL pointing to another wiki's rest.php endpoint.
              * @param {ForeignApi} foreignActionApi
              * @param {ForeignRestOptions} [options]
-             * @since 1.26
+             * @since 1.36
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.ForeignApi-method-constructor
              */
             constructor(
diff --git a/mw/Map.d.ts b/mw/Map.d.ts
index 0944f4d..dbf9e8d 100644
--- a/mw/Map.d.ts
+++ b/mw/Map.d.ts
@@ -12,6 +12,15 @@ declare global {
         class Map<V extends Record<string, any> = any> {
             private values: V;
 
+            /**
+             * Check if a given key exists in the map.
+             *
+             * @param selection Key to check
+             * @returns True if the key exists
+             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Map-method-exists
+             */
+            exists(selection: keyof V): boolean;
+
             /**
              * Get the value of one or more keys.
              *
@@ -23,9 +32,9 @@ declare global {
              * an object of key/values. If no selection is passed, a new object with all key/values is returned.
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Map-method-get
              */
-            get(): V;
             get<S extends keyof V>(selection: S[], fallback?: any): Pick<V, S>;
             get<S extends keyof V>(selection: S, fallback?: V[S]): V[S];
+            get(): V;
 
             /**
              * Set the value of one or more keys.
@@ -37,15 +46,6 @@ declare global {
              */
             set<S extends keyof V>(selection: S, value: V[S]): boolean;
             set(selection: Partial<V>): boolean;
-
-            /**
-             * Check if a given key exists in the map.
-             *
-             * @param selection Key to check
-             * @returns True if the key exists
-             * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Map-method-exists
-             */
-            exists(selection: keyof V): boolean;
         }
     }
 }
diff --git a/mw/RegExp.d.ts b/mw/RegExp.d.ts
index 5518e1a..6966c7d 100644
--- a/mw/RegExp.d.ts
+++ b/mw/RegExp.d.ts
@@ -14,7 +14,7 @@ declare global {
              * @deprecated
              * @since 1.26; deprecated since 1.34
              * @param {string} str String to escape
-             * @return {string} Escaped string
+             * @returns {string} Escaped string
              * @see https://doc.wikimedia.org/mediawiki-core/REL1_29/js/source/mediawiki.RegExp.html#mw-RegExp-static-method-escape
              */
             function escape(str: string): string;
diff --git a/mw/Rest.d.ts b/mw/Rest.d.ts
index 3026533..df5919f 100644
--- a/mw/Rest.d.ts
+++ b/mw/Rest.d.ts
@@ -40,15 +40,11 @@ declare global {
              */
             constructor(options?: Partial<RestOptions>);
 
-            /**
-             * @private
-             */
-            defaults: RestOptions;
+            private defaults: RestOptions;
 
             /**
              * Abort all unfinished requests issued by this Api object.
              *
-             * @returns {void}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Rest-method-abort
              */
             abort(): void;
diff --git a/mw/Title.d.ts b/mw/Title.d.ts
index 172c91e..2b55b07 100644
--- a/mw/Title.d.ts
+++ b/mw/Title.d.ts
@@ -1,6 +1,6 @@
 import { QueryParams } from "./Uri";
 
-type title = string | mw.Title;
+export type TitleLike = string | mw.Title;
 
 declare global {
     namespace mw {
@@ -33,7 +33,6 @@ declare global {
             /**
              * Store page existence
              *
-             * @property {Object} exist
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-property-exist
              */
             static exist: {
@@ -57,15 +56,14 @@ declare global {
                  * Title.exist.set( ['File:Foo_bar.jpg', ...], false );
                  * ```
                  *
-                 * @param {string|Array} titles Title(s) in strict prefixedDb title form
+                 * @param {string|string[]} titles Title(s) in strict prefixedDb title form
                  * @param {boolean} [state=true] State of the given titles
-                 * @return {boolean}
+                 * @returns {boolean}
                  */
                 set(titles: string | string[], state?: boolean): boolean;
             };
 
             /**
-             * @method constructor
              * @param {string} title Title of the page. If no second argument given,
              *  this will be searched for a namespace
              * @param {number} [namespace=NS_MAIN] If given, will used as default namespace for the given title
@@ -77,7 +75,7 @@ declare global {
             /**
              * Check the title can have an associated talk page
              *
-             * @return {boolean} The title can have an associated talk page
+             * @returns {boolean} The title can have an associated talk page
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-canHaveTalkPage
              */
             canHaveTalkPage(): boolean;
@@ -85,7 +83,7 @@ declare global {
             /**
              * Whether this title exists on the wiki.
              *
-             * @return {boolean|null} Boolean if the information is available, otherwise null
+             * @returns {boolean|null} Boolean if the information is available, otherwise null
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-exists
              */
             exists(): boolean | null;
@@ -93,7 +91,7 @@ declare global {
             /**
              * Get the extension of the page name (if any)
              *
-             * @return {string|null} Name extension or null if there is none
+             * @returns {string|null} Name extension or null if there is none
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getExtension
              */
             getExtension(): string | null;
@@ -106,7 +104,7 @@ declare global {
              * Note that this method will work for non-file titles but probably give nonsensical results.
              * A title like "User:Dr._J._Fail" will be returned as "Dr. J"! Use {@link getMainText} instead.
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getFileNameTextWithoutExtension
              */
             getFileNameTextWithoutExtension(): string;
@@ -119,7 +117,7 @@ declare global {
              * Note that this method will work for non-file titles but probably give nonsensical results.
              * A title like "User:Dr._J._Fail" will be returned as "Dr._J"! Use {@link getMain} instead.
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getFileNameWithoutExtension
              */
             getFileNameWithoutExtension(): string;
@@ -130,7 +128,7 @@ declare global {
              * Note that this method (by design) does not include the hash character and
              * the value is not url encoded.
              *
-             * @return {string|null}
+             * @returns {string|null}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getFragment
              */
             getFragment(): string | null;
@@ -140,7 +138,7 @@ declare global {
              *
              * Example: "Example_image.svg" for "File:Example_image.svg".
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getMain
              */
             getMain(): string;
@@ -150,7 +148,7 @@ declare global {
              *
              * Example: "Example image.svg" for "File:Example_image.svg".
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getMainText
              */
             getMainText(): string;
@@ -161,7 +159,7 @@ declare global {
              * "Dr. J"! Use {@link getMain} or {@link getMainText} for the actual page name.
              *
              * @deprecated since 1.40, use {@link getFileNameWithoutExtension} instead
-             * @return {string} File name without file extension, in the canonical form with underscores
+             * @returns {string} File name without file extension, in the canonical form with underscores
              *  instead of spaces. For example, the title "File:Example_image.svg" will be returned as
              *  "Example_image".
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getName
@@ -173,7 +171,7 @@ declare global {
              *
              * Example: 6 for "File:Example_image.svg".
              *
-             * @return {number}
+             * @returns {number}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getNamespaceId
              */
             getNamespaceId(): number;
@@ -184,7 +182,7 @@ declare global {
              * Example: "File:" for "File:Example_image.svg".
              * In #NS_MAIN this is '', otherwise namespace name plus ':'
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getNamespacePrefix
              */
             getNamespacePrefix(): string;
@@ -195,7 +193,7 @@ declare global {
              * "Dr. J"! Use {@link getMainText} for the actual page name.
              *
              * @deprecated since 1.40, use {@link getFileNameTextWithoutExtension} instead
-             * @return {string} File name without file extension, formatted with spaces instead of
+             * @returns {string} File name without file extension, formatted with spaces instead of
              *  underscores. For example, the title "File:Example_image.svg" will be returned as
              *  "Example image".
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getNameText
@@ -208,7 +206,7 @@ declare global {
              * Example: "File:Example_image.svg".
              * Most useful for API calls, anything that must identify the "title".
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getPrefixedDb
              */
             getPrefixedDb(): string;
@@ -218,7 +216,7 @@ declare global {
              *
              * Example: "File:Example image.svg" for "File:Example_image.svg".
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getPrefixedText
              */
             getPrefixedText(): string;
@@ -233,7 +231,7 @@ declare global {
              * - "Foo:Bar" relative to any namespace other than Foo stays "Foo:Bar".
              *
              * @param {number} namespace The namespace to be relative to
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getRelativeText
              */
             getRelativeText(namespace: number): string;
@@ -241,7 +239,7 @@ declare global {
             /**
              * Get the title for the subject page of a talk page
              *
-             * @return {Title|null} The title for the subject page of a talk page, null if not available
+             * @returns {Title|null} The title for the subject page of a talk page, null if not available
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getSubjectPage
              */
             getSubjectPage(): Title | null;
@@ -249,7 +247,7 @@ declare global {
             /**
              * Get the title for the associated talk page
              *
-             * @return {Title|null} The title for the associated talk page, null if not available
+             * @returns {Title|null} The title for the associated talk page, null if not available
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getTalkPage
              */
             getTalkPage(): Title | null;
@@ -257,9 +255,9 @@ declare global {
             /**
              * Get the URL to this title
              *
-             * @param {Object} [params] A mapping of query parameter names to values,
+             * @param {QueryParams} [params] A mapping of query parameter names to values,
              *     e.g. `{ action: 'edit' }`.
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getUrl
              */
             getUrl(params?: QueryParams): string;
@@ -267,27 +265,21 @@ declare global {
             /**
              * Check if the title is in a talk namespace
              *
-             * @return {boolean} The title is in a talk namespace
+             * @returns {boolean} The title is in a talk namespace
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-isTalkPage
              */
             isTalkPage(): boolean;
 
             /**
-             * Alias of {@link mw.Title.getPrefixedDb}
+             * Alias of {@link getPrefixedDb}
              *
-             * TODO: Use @-alias when we switch to JSDoc
-             *
-             * @method
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-toString
              */
             toString(): string;
 
             /**
-             * Alias of {@link mw.Title.getPrefixedText}
-             *
-             * TODO: Use @-alias when we switch to JSDoc
+             * Alias of {@link getPrefixedText}
              *
-             * @method
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-toText
              */
             toText(): string;
@@ -296,11 +288,11 @@ declare global {
              * Whether this title exists on the wiki.
              *
              * @param {string|Title} title prefixed db-key name (string) or instance of Title
-             * @return {boolean|null} Boolean if the information is available, otherwise null
+             * @returns {boolean|null} Boolean if the information is available, otherwise null
              * @throws {Error} If title is not a string or mw.Title
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-exists
              */
-            static exists(title: title): boolean | null;
+            static exists(title: TitleLike): boolean | null;
 
             /**
              * Check if a given namespace is a talk namespace
@@ -308,7 +300,7 @@ declare global {
              * See NamespaceInfo::isTalk in PHP
              *
              * @param {number} namespaceId Namespace ID
-             * @return {boolean} Namespace is a talk namespace
+             * @returns {boolean} Namespace is a talk namespace
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-isTalkNamespace
              */
             static isTalkNamespace(namespaceId: number): boolean;
@@ -324,7 +316,7 @@ declare global {
              *
              * @param {number} namespace Namespace to use for the title
              * @param {string} title
-             * @return {Title|null} A valid Title object or null if the title is invalid
+             * @returns {Title|null} A valid Title object or null if the title is invalid
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-makeTitle
              */
             static makeTitle(namespace: number, title: string): Title | null;
@@ -336,7 +328,7 @@ declare global {
              *
              * @param {string} uncleanName The unclean file name including file extension but
              *   without namespace
-             * @return {Title|null} A valid Title object or null if the title is invalid
+             * @returns {Title|null} A valid Title object or null if the title is invalid
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-newFromFileName
              */
             static newFromFileName(uncleanName: string): Title | null;
@@ -349,7 +341,7 @@ declare global {
              * ```
              *
              * @param {HTMLElement|JQuery} img The image to use as a base
-             * @return {Title|null} The file title or null if unsuccessful
+             * @returns {Title|null} The file title or null if unsuccessful
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-newFromImg
              */
             static newFromImg(img: HTMLElement | JQuery): Title;
@@ -363,7 +355,7 @@ declare global {
              *
              * @param {string} title
              * @param {number} [namespace=NS_MAIN] Default namespace
-             * @return {Title|null} A valid Title object or null if the title is invalid
+             * @returns {Title|null} A valid Title object or null if the title is invalid
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-newFromText
              */
             static newFromText(title: string, namespace?: number): Title | null;
@@ -380,7 +372,7 @@ declare global {
              *  Makes sure that a file is uploadable under the title returned.
              *  There are pages in the file namespace under which file upload is impossible.
              *  Automatically assumed if the title is created in the Media namespace.
-             * @return {Title|null} A valid Title object or null if the input cannot be turned into a valid title
+             * @returns {Title|null} A valid Title object or null if the input cannot be turned into a valid title
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-static-method-newFromUserInput
              */
             static newFromUserInput(
@@ -395,7 +387,7 @@ declare global {
              * Keep in sync with File::normalizeExtension() in PHP.
              *
              * @param {string} extension File extension (without the leading dot)
-             * @return {string} File extension in canonical form
+             * @returns {string} File extension in canonical form
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-normalizeExtension
              */
             static normalizeExtension(extension: string): string;
@@ -404,7 +396,7 @@ declare global {
              * PHP's strtoupper differs from {@link String.toUpperCase} in a number of cases (T147646).
              *
              * @param {string} chr Unicode character
-             * @return {string} Unicode character, in upper case, according to the same rules as in PHP
+             * @returns {string} Unicode character, in upper case, according to the same rules as in PHP
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-phpCharToUpper
              */
             static phpCharToUpper(chr: string): string;
@@ -415,7 +407,7 @@ declare global {
              * See NamespaceInfo::wantSignatures in PHP
              *
              * @param {number} namespaceId Namespace ID
-             * @return {boolean} Namespace is a signature namespace
+             * @returns {boolean} Namespace is a signature namespace
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-wantSignaturesNamespace
              */
             static wantSignatureNamespace(namespaceId: number): boolean;
diff --git a/mw/Uri.d.ts b/mw/Uri.d.ts
index 8372f9f..d2f3a48 100644
--- a/mw/Uri.d.ts
+++ b/mw/Uri.d.ts
@@ -23,11 +23,9 @@ declare global {
          * A factory method to create an mw.Uri class with a default location to resolve relative URLs
          * against (including protocol-relative URLs).
          *
-         * @method
          * @param {string|Function} documentLocation A full url, or function returning one.
          *  If passed a function, the return value may change over time and this will be honoured. (T74334)
-         * @member mw
-         * @return {Function} An mw.Uri class constructor
+         * @returns {Function} An mw.Uri class constructor
          * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-UriRelative
          */
         function UriRelative(documentLocation: string | (() => string)): typeof Uri;
@@ -136,11 +134,10 @@ declare global {
              * file where they make use of named capture groups. That syntax isn't valid in JavaScript ES5,
              * so the server-side strips these before delivering to the client.
              *
-             * @private
              * @property {Object} parser
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-static-property-parser
              */
-            static parser: {
+            private static parser: {
                 strict: RegExp;
                 loose: RegExp;
             };
@@ -148,11 +145,10 @@ declare global {
             /**
              * The order here matches the order of captured matches in the `parser` property regexes.
              *
-             * @private
              * @property {string[]} properties
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-static-property-properties
              */
-            static properties: [
+            private static properties: [
                 "protocol",
                 "user",
                 "password",
@@ -185,7 +181,7 @@ declare global {
             /**
              * Clone this URI
              *
-             * @return {Uri} New URI object with same properties
+             * @returns {Uri} New URI object with same properties
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-clone
              */
             clone(): Uri;
@@ -193,9 +189,9 @@ declare global {
             /**
              * Extend the query section of the URI with new parameters.
              *
-             * @param {Object} parameters Query parameters to add to ours (or to override ours with) as an
+             * @param {QueryParams} parameters Query parameters to add to ours (or to override ours with) as an
              *  object
-             * @return {Uri} This URI object
+             * @returns {Uri} This URI object
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-extend
              */
             extend(parameters: QueryParams): Uri;
@@ -205,7 +201,7 @@ declare global {
              *
              * In most real-world URLs this is simply the hostname, but the definition of 'authority' section is more general.
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-getAuthority
              */
             getAuthority(): string;
@@ -213,7 +209,7 @@ declare global {
             /**
              * Get host and port section of a URI.
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-getHostPort
              */
             getHostPort(): string;
@@ -223,7 +219,7 @@ declare global {
              *
              * Does not preserve the original order of arguments passed in the URI. Does handle escaping.
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-getQueryString
              */
             getQueryString(): string;
@@ -231,7 +227,7 @@ declare global {
             /**
              * Get everything after the authority section of the URI.
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-getRelativePath
              */
             getRelativePath(): string;
@@ -239,7 +235,7 @@ declare global {
             /**
              * Get user and password section of a URI.
              *
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-getUserInfo
              */
             getUserInfo(): string;
@@ -255,7 +251,7 @@ declare global {
              * web2017-polyfills, which loads a polyfill if needed) in contexts where the fragment
              * is important.
              *
-             * @return {string} The URI string
+             * @returns {string} The URI string
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-toString
              */
             toString(): `${string}://${string}`;
@@ -263,13 +259,12 @@ declare global {
             /**
              * Parse a string and set our properties accordingly.
              *
-             * @private
              * @param {string} str URI, see constructor.
              * @param {Object} options See constructor.
              * @throws {Error} when the query string or fragment contains an unknown % sequence
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-method-parse
              */
-            parse(str: string, options: Partial<UriOptions>): void;
+            private parse(str: string, options: Partial<UriOptions>): void;
 
             /**
              * Decode a url encoded value.
@@ -278,7 +273,7 @@ declare global {
              * `+` with a space.
              *
              * @param {string} s String to decode
-             * @return {string} Decoded string
+             * @returns {string} Decoded string
              * @throws {Error} when the string contains an unknown % sequence
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-static-method-decode
              */
@@ -292,7 +287,7 @@ declare global {
              * mw.util.rawurlencode, except this also replaces spaces with `+`.
              *
              * @param {string} s String to encode
-             * @return {string} Encoded string for URI
+             * @returns {string} Encoded string for URI
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Uri-static-method-encode
              */
             static encode(s: string): string;
diff --git a/mw/config.d.ts b/mw/config.d.ts
index e9ec11e..e3ad45c 100644
--- a/mw/config.d.ts
+++ b/mw/config.d.ts
@@ -62,12 +62,6 @@ declare global {
              * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgDBname
              */
             wgDBname: string;
-            /**
-             * The wiki identifier. Should be preferred over wgDBname.
-             *
-             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgWikiID
-             */
-            wgWikiID: string;
             /**
              * Root path used for extension static assets (e.g. images). Append '/' then the name of the extension to get the root path for a given extension.
              *
@@ -116,6 +110,7 @@ declare global {
              * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgSiteName
              */
             wgSiteName: string;
+            wgUrlProtocols: string;
             /**
              * If a wiki has language variants (such as the Chinese and the Serbian Wikipedias), set to a path beginning at the root for language variants other than wgContentLanguage. The path contains two placeholders: "$1" is to be replaced by the page title, and "$2" is to be replaced by the language code of the language variant (e.g. "zh-tw"). If the wiki does not have language variants, set to false. See also $wgVariantArticlePath.
              *
@@ -128,6 +123,12 @@ declare global {
              * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgVersion
              */
             wgVersion: string;
+            /**
+             * The wiki identifier. Should be preferred over wgDBname.
+             *
+             * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgWikiID
+             */
+            wgWikiID: string;
             /**
              * The action performed, e.g. "edit" for edit pages, or "view" for page views. See Manual:Parameters to index.php#Actions.
              *
@@ -351,7 +352,6 @@ declare global {
              * @see https://www.mediawiki.org/wiki/Manual:Interface/JavaScript#wgDiffNewId
              */
             wgDiffNewId: number;
-            wgUrlProtocols: string;
             [key: string]: unknown; // more config keys can be added by extensions
         }>;
     }
diff --git a/mw/cookie.d.ts b/mw/cookie.d.ts
index 847fcdc..02feee3 100644
--- a/mw/cookie.d.ts
+++ b/mw/cookie.d.ts
@@ -13,8 +13,8 @@ declare global {
              *
              * @param {string} key The key for the cookie
              * @param {string} [prefix] The prefix of the key. If undefined or null, `$wgCookiePrefix` is used
-             * @param {*} [defaultValue] A value to return if the cookie does not exist
-             * @returns {*} If the cookie exists, the value of the cookie, otherwise `defaultValue`
+             * @param {Mixed} [defaultValue] A value to return if the cookie does not exist
+             * @returns {Mixed} If the cookie exists, the value of the cookie, otherwise `defaultValue`
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.cookie-method-get
              */
             function get<D>(
@@ -29,8 +29,8 @@ declare global {
              *
              * @param {string} key The key for the cookie
              * @param {string} [prefix] The prefix of the key. If undefined or null, `$wgCookiePrefix` is used
-             * @param {*} defaultValue A value to return if the cookie does not exist
-             * @returns {*} If the cookie exists, the value of the cookie, otherwise `defaultValue`
+             * @param {Mixed} [defaultValue] A value to return if the cookie does not exist
+             * @returns {Mixed} If the cookie exists, the value of the cookie, otherwise `defaultValue`
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.cookie-method-getCrossSite
              */
             function getCrossSite<D>(
@@ -59,7 +59,6 @@ declare global {
              * @param {boolean} [options.secure] Whether or not to include the secure attribute (Does **not** use the wgCookieSecure configuration variable)
              * @param {string} [options.sameSite] The `SameSite` flag of the cookie (case-insensitive; default is to omit the flag, which results in `Lax` on modern browsers). Set to `None` *and* set `secure` to `true` if the cookie needs to be visible on cross-domain requests
              * @param {boolean} [options.sameSiteLegacy] If true, `SameSite` = `None` cookies will also be sent as non-`SameSite` cookies with an "ss0-" prefix, to work around old browsers interpreting the standard differently
-             * @returns {void}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.cookie-method-set
              */
             // see https://stackoverflow.com/a/64932909 for <SS>
@@ -70,12 +69,12 @@ declare global {
                     | Date
                     | number
                     | Partial<{
-                          expires: Date | number;
-                          prefix: string;
                           domain: string;
+                          expires: Date | number;
                           path: string;
-                          secure: boolean;
+                          prefix: string;
                           sameSite: Lowercase<SS> extends SameSite ? SS : SameSite;
+                          secure: boolean;
                       }>
             ): void;
         }
diff --git a/mw/experiments.d.ts b/mw/experiments.d.ts
index 41fd4da..3dcbe37 100644
--- a/mw/experiments.d.ts
+++ b/mw/experiments.d.ts
@@ -31,13 +31,13 @@ declare global {
              * // the A or B bucket. If the experiment were disabled, then the user would always be
              * // assigned to the control bucket.
              * {
-             *   name: 'My first experiment',
-             *   enabled: true,
-             *   buckets: {
-             *     control: 0.5
-             *     A: 0.25,
-             *     B: 0.25
-             *   }
+             *     name: 'My first experiment',
+             *     enabled: true,
+             *     buckets: {
+             *         control: 0.5
+             *         A: 0.25,
+             *         B: 0.25
+             *     }
              * }
              * ```
              *
@@ -50,7 +50,7 @@ declare global {
              *  that the user will be assigned to that bucket
              * @param {string} token A token that uniquely identifies the user for the
              *  duration of the experiment
-             * @return {string|undefined} The bucket
+             * @returns {string|undefined} The bucket
              */
             function getBucket(experiment: Experiment, token: string): string | undefined;
         }
diff --git a/mw/global.d.ts b/mw/global.d.ts
index 4600a5b..f4d3f94 100644
--- a/mw/global.d.ts
+++ b/mw/global.d.ts
@@ -9,7 +9,6 @@ declare global {
      * Schedule a function to run once the page is ready (DOM loaded).
      *
      * @since 1.5.8
-     * @member global
      * @param {Function} fn
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/global-method-addOnloadHook
      */
@@ -22,19 +21,16 @@ declare global {
      * be loaded and executed once.
      *
      * @since 1.12.2
-     * @member global
      * @param {string} title
-     * @return {HTMLScriptElement|null} Script tag, or null if it was already imported before
+     * @returns {HTMLScriptElement|null} Script tag, or null if it was already imported before
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/global-method-importScript
      */
     function importScript(title: string): HTMLScriptElement | null;
 
     /**
      * @since 1.12.2
-     * @method importScriptURI
-     * @member global
      * @param {string} url
-     * @return {HTMLScriptElement|null} Script tag, or null if it was already imported before
+     * @returns {HTMLScriptElement|null} Script tag, or null if it was already imported before
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/global-method-importScriptURI
      */
     function importScriptURI(url: string): HTMLScriptElement | null;
@@ -43,19 +39,17 @@ declare global {
      * Import a local CSS content page, for use by user scripts and site-wide scripts.
      *
      * @since 1.12.2
-     * @member global
      * @param {string} title
-     * @return {HTMLLinkElement} Link tag
+     * @returns {HTMLLinkElement} Link tag
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/global-method-importStylesheet
      */
     function importStylesheet(title: string): HTMLLinkElement;
 
     /**
      * @since 1.12.2
-     * @member global
      * @param {string} url
      * @param {string} media
-     * @return {HTMLLinkElement} Link tag
+     * @returns {HTMLLinkElement} Link tag
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/global-method-importStylesheetURI
      */
     function importStylesheetURI(url: string, media: string): HTMLLinkElement;
diff --git a/mw/hook.d.ts b/mw/hook.d.ts
index bf6b2fd..b7348e6 100644
--- a/mw/hook.d.ts
+++ b/mw/hook.d.ts
@@ -48,7 +48,6 @@ interface Hook<T extends any[] = any[]> {
      * Register a hook handler.
      *
      * @param {...Function} handler Function to bind.
-     * @chainable
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook-method-add
      */
     add(...handler: Array<(...data: T) => any>): this;
@@ -56,8 +55,7 @@ interface Hook<T extends any[] = any[]> {
     /**
      * Call hook handlers with data.
      *
-     * @param {*} data
-     * @chainable
+     * @param {Mixed} data
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook-method-fire
      */
     fire(...data: T): this;
@@ -66,7 +64,6 @@ interface Hook<T extends any[] = any[]> {
      * Unregister a hook handler.
      *
      * @param {...Function} handler Function to unbind.
-     * @chainable
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.hook-method-remove
      */
     remove(...handler: Array<(...data: T) => any>): this;
diff --git a/mw/html.d.ts b/mw/html.d.ts
index 6267200..289805d 100644
--- a/mw/html.d.ts
+++ b/mw/html.d.ts
@@ -26,7 +26,7 @@ declare global {
              *  - string: Text to be escaped.
              *  - null: The element is treated as void with short closing form, e.g. `<br/>`.
              *  - this.Raw: The raw value is directly included.
-             * @return {string} HTML
+             * @returns {string} HTML
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.html-method-element
              */
             function element(
@@ -46,7 +46,7 @@ declare global {
              * ```
              *
              * @param {string} s The string to escape
-             * @return {string} HTML
+             * @returns {string} HTML
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.html-method-escape
              */
             function escape(s: string): string;
diff --git a/mw/index.d.ts b/mw/index.d.ts
index f7f300e..9c68b8f 100644
--- a/mw/index.d.ts
+++ b/mw/index.d.ts
@@ -43,12 +43,16 @@ declare global {
          * Empty object for third-party libraries, for cases where you don't
          * want to add a new global, or the global is bad and needs containment
          * or wrapping.
-         *
-         * @property {Object}
          */
         const libs: any;
 
-        // types for mw.widgets are out of scope!
+        /**
+         * OOUI widgets specific to MediaWiki
+         *
+         * types for mw.widgets are out of scope!
+         *
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/source/mediawiki.base.html#mw-property-libs
+         */
         const widgets: any;
 
         /**
@@ -59,7 +63,7 @@ declare global {
          * @since 1.25
          * @param {string} formatString Format string
          * @param {...Mixed} parameters Values for $N replacements
-         * @return {string} Formatted string
+         * @returns {string} Formatted string
          * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-format
          */
         function format(formatString: string, ...parameters: unknown[]): string;
@@ -71,7 +75,8 @@ declare global {
          * floating-point values with microsecond precision that are guaranteed to be monotonic.
          * On all other browsers, it will fall back to using `Date`.
          *
-         * @return {number} Current time
+         * @returns {number} Current time
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-now
          */
         function now(): number;
 
@@ -98,7 +103,6 @@ declare global {
          * - <https://developers.google.com/web/updates/2015/08/using-requestidlecallback>
          * [RAIL]: https://developers.google.com/web/fundamentals/performance/rail
          *
-         * @member mw
          * @param {Function} callback
          * @param {Object} [options]
          * @param {number} [options.timeout] If set, the callback will be scheduled for
@@ -122,6 +126,7 @@ declare global {
          *
          * @param {string} topic Topic name
          * @param {Object|number|string} [data] Data describing the event.
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-track
          */
         function track(topic: string, data?: object | number | string): void;
 
@@ -131,6 +136,7 @@ declare global {
          * @private
          * @param {string} topic Topic name
          * @param {Object} data Data describing the event, encoded as an object; see {@link errorLogger.logError}
+         * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-trackError
          */
         function trackError(topic: string, data: object): void;
 
diff --git a/mw/language.d.ts b/mw/language.d.ts
index 32bbe5e..f84829c 100644
--- a/mw/language.d.ts
+++ b/mw/language.d.ts
@@ -55,7 +55,6 @@ declare global {
              * Information about month names in current UI language.
              *
              * @property {Object}
-             * @member mw.language
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-property-months
              */
             const months: {
@@ -92,7 +91,7 @@ declare global {
              * See LanguageCode::bcp47 for the PHP implementation.
              *
              * @param {string} languageTag Well-formed language tag
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-bcp47
              */
             function bcp47(languageTag: string): string;
@@ -106,7 +105,7 @@ declare global {
              *
              * @param {string} word
              * @param {string} form
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-convertGrammar
              */
             function convertGrammar(word: string, form: string): string;
@@ -116,7 +115,7 @@ declare global {
              *
              * @param {number} num Value to be converted
              * @param {boolean} [integer=false] Whether to convert the return value to an integer
-             * @return {number|string} Formatted number
+             * @returns {number|string} Formatted number
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-convertNumber
              */
             function convertNumber(num: number, integer?: boolean): number | string;
@@ -127,7 +126,7 @@ declare global {
              * @param {number} count Non-localized quantifier
              * @param {Array} forms List of plural forms
              * @param {Object} [explicitPluralForms] List of explicit plural forms
-             * @return {string} Correct form for quantifier in this language
+             * @returns {string} Correct form for quantifier in this language
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-convertPlural
              */
             function convertPlural(
@@ -140,7 +139,7 @@ declare global {
              * Helper function to flip transformation tables.
              *
              * @param {...Object} tables Transformation tables
-             * @return {Object}
+             * @returns {Object}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-flipTransform
              */
             function flipTransform<T extends Record<PropertyKey, PropertyKey>>(
@@ -157,7 +156,7 @@ declare global {
              *
              * @param {string} gender 'male', 'female', or anything else for neutral.
              * @param {Array} forms List of gender forms
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-gender
              */
             function gender<T extends string>(gender: string, forms: [T?, T?, T?]): T;
@@ -170,7 +169,7 @@ declare global {
              *
              * @param {string} langCode
              * @param {string} dataKey
-             * @return {any} Value stored in the mw.Map (or `undefined` if there is no map for the
+             * @returns {Mixed} Value stored in the mw.Map (or `undefined` if there is no map for the
              *  specified langCode)
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-getData
              */
@@ -179,7 +178,7 @@ declare global {
             /**
              * Get the digit transform table for current UI language.
              *
-             * @return {Object|Array}
+             * @returns {Object|Array}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-getDigitTransformTable
              */
             function getDigitTransformTable(): string[] | Record<number | string, string>;
@@ -187,7 +186,7 @@ declare global {
             /**
              * Get the language fallback chain for current UI language, including the language itself.
              *
-             * @return {string[]} List of language keys, e.g. `['pfl', de', 'en']`
+             * @returns {string[]} List of language keys, e.g. `['pfl', de', 'en']`
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-getFallbackLanguageChain
              */
             function getFallbackLanguageChain(): string[];
@@ -195,7 +194,7 @@ declare global {
             /**
              * Get the language fallback chain for current UI language (not including the language itself).
              *
-             * @return {string[]} List of language keys, e.g. `['de', 'en']`
+             * @returns {string[]} List of language keys, e.g. `['de', 'en']`
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-getFallbackLanguages
              */
             function getFallbackLanguages(): string[];
@@ -203,7 +202,7 @@ declare global {
             /**
              * Get the separator transform table for current UI language.
              *
-             * @return {Object|Array}
+             * @returns {Object|Array}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-getSeparatorTransformTable
              */
             function getSeparatorTransformTable(): string[] | Record<number | string, string>;
@@ -214,7 +213,7 @@ declare global {
              * See Language::listToText in languages/Language.php
              *
              * @param {string[]} list
-             * @return {string}
+             * @returns {string}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-listToText
              */
             function listToText(list: string[]): string;
@@ -226,7 +225,7 @@ declare global {
              *
              * @param {string} langCode
              * @param {string|Object} dataKey Key or object of key/values
-             * @param {any} [value] Value for dataKey, omit if dataKey is an object
+             * @param {Mixed} [value] Value for dataKey, omit if dataKey is an object
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-setData
              */
             function setData(langCode: string, dataKey: string, value: any): void;
@@ -246,7 +245,7 @@ declare global {
              * @param {string} options.decimal The decimal separator. Defaults to: `'.'`.
              * @param {string} options.group The group separator. Defaults to: `','`.
              * @param {number|null} options.minimumGroupingDigits
-             * @return {string}
+             * @returns {string}
              */
             function commafyNumber(
                 value: number,
@@ -270,7 +269,7 @@ declare global {
              * @param {number} size The length to pad to
              * @param {string} [ch='0'] Character to pad with
              * @param {boolean} [end=false] Adds padding at the end if true, otherwise pads at start
-             * @return {string}
+             * @returns {string}
              */
             function pad(text: string, size: number, ch?: string, end?: boolean): string;
 
@@ -280,7 +279,7 @@ declare global {
              * @private
              * @param {Array} forms Number of forms given to convertPlural
              * @param {number} count Number of forms required
-             * @return {Array} Padded array of forms
+             * @returns {Array} Padded array of forms
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.language-method-preConvertPlural
              */
             function preConvertPlural(forms: string[], count: number): string[];
@@ -291,7 +290,7 @@ declare global {
              * @private
              * @param {string} str The string to replicate
              * @param {number} num Number of times to replicate the string
-             * @return {string}
+             * @returns {string}
              */
             function replicate(str: string, num: number): string;
         }
diff --git a/mw/loader.d.ts b/mw/loader.d.ts
index c473cfa..dccb866 100644
--- a/mw/loader.d.ts
+++ b/mw/loader.d.ts
@@ -31,7 +31,7 @@ interface ModuleRequire {
      * Get the exported value of a module.
      *
      * @param moduleName Module name
-     * @return Exported value
+     * @returns Exported value
      */
     (moduleName: string): any;
 }
@@ -87,7 +87,7 @@ declare global {
              * @param {string} text CSS text
              * @param {Node|null} [nextNode] The element where the style tag
              *  should be inserted before
-             * @return {HTMLStyleElement} Reference to the created style element
+             * @returns {HTMLStyleElement} Reference to the created style element
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-addStyleTag
              */
             function addStyleTag(text: string, nextNode?: Node | null): HTMLStyleElement;
@@ -95,8 +95,7 @@ declare global {
             /**
              * Get the names of all registered ResourceLoader modules.
              *
-             * @member mw.loader
-             * @return {string[]}
+             * @returns {string[]}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-getModuleNames
              */
             function getModuleNames(): string[];
@@ -119,9 +118,8 @@ declare global {
              * } );
              * ```
              *
-             * @member mw.loader
              * @param {string} url Script URL
-             * @return {JQuery.Promise} Resolved when the script is loaded
+             * @returns {JQuery.Promise} Resolved when the script is loaded
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-getScript
              */
             function getScript(url: string): JQuery.Promise<any>;
@@ -139,7 +137,7 @@ declare global {
              * - `missing`: The module was requested but is not defined according to the server.
              *
              * @param {string} module Name of module
-             * @return {string|null} The state, or null if the module (or its state) is not
+             * @returns {string|null} The state, or null if the module (or its state) is not
              *  in the registry.
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-getState
              */
@@ -156,7 +154,7 @@ declare global {
              *   as '`[name]@[version]`". This version should match the requested version
              *   (from #batchRequest and #registry). This avoids race conditions (T117587).
              *
-             * - 1. {Function|Array|string|Object} [script] Module code. This can be a function,
+             * - 1. {ModuleScript} [script] Module code. This can be a function,
              *   a list of URLs to load via `<script src>`, a string for `globalEval()`, or an
              *   object like {"files": {"foo.js":function, "bar.js": function, ...}, "main": "foo.js"}.
              *   If an object is provided, the main file will be executed immediately, and the other
@@ -164,7 +162,7 @@ declare global {
              *   provided, it will be executed/evaluated immediately. If an array is provided, all
              *   URLs in the array will be loaded immediately, and executed as soon as they arrive.
              *
-             * - 2. {Object} [style] Should follow one of the following patterns:
+             * - 2. {ModuleStyle} [style] Should follow one of the following patterns:
              *
              *   ```js
              *   { "css": [css, ..] }
@@ -174,8 +172,8 @@ declare global {
              *   The reason css strings are not concatenated anymore is T33676. We now check
              *   whether it's safe to extend the stylesheet.
              *
-             * - 3. {Object} [messages] List of key/value pairs to be added to {@link mw.messages}.
-             * - 4. {Object} [templates] List of key/value pairs to be added to {@link mw.templates}.
+             * - 3. {ModuleMessages} [messages] List of key/value pairs to be added to {@link mw.messages}.
+             * - 4. {ModuleTemplates} [templates] List of key/value pairs to be added to {@link mw.templates}.
              * - 5. {String|null} [deprecationWarning] Deprecation warning if any
              *
              * The declarator must not use any scope variables, since it will be serialized with
@@ -196,14 +194,14 @@ declare global {
              * Does not support mw.loader.store caching.
              *
              * @param {string} module
-             * @param {Function|Array|string|Object} [script] Module code. This can be a function,
+             * @param {ModuleScript} [script] Module code. This can be a function,
              *  a list of URLs to load via `<script src>`, a string for `domEval()`, or an
              *  object like {"files": {"foo.js":function, "bar.js": function, ...}, "main": "foo.js"}.
              *  If an object is provided, the main file will be executed immediately, and the other
              *  files will only be executed if loaded via require(). If a function or string is
              *  provided, it will be executed/evaluated immediately. If an array is provided, all
              *  URLs in the array will be loaded immediately, and executed as soon as they arrive.
-             * @param {Object} [style] Should follow one of the following patterns:
+             * @param {ModuleStyle} [style] Should follow one of the following patterns:
              *
              * ```js
              * { "css": [css, ..] }
@@ -212,8 +210,8 @@ declare global {
              *
              * The reason css strings are not concatenated anymore is T33676. We now check
              * whether it's safe to extend the stylesheet.
-             * @param {Object} [messages] List of key/value pairs to be added to {@link mw.messages}.
-             * @param {Object} [templates] List of key/value pairs to be added to {@link mw.templates}.
+             * @param {ModuleMessages} [messages] List of key/value pairs to be added to {@link mw.messages}.
+             * @param {ModuleTemplates} [templates] List of key/value pairs to be added to {@link mw.templates}.
              * @param {string|null} [deprecationWarning] Deprecation warning if any
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-implement
              */
@@ -330,12 +328,11 @@ declare global {
              *
              * Since MediaWiki 1.28 the promise is resolved with a `require` function.
              *
-             * @member mw.loader
              * @param {string|Array} dependencies Module name or array of modules names the
              *  callback depends on to be ready before executing
              * @param {Function} [ready] Callback to execute when all dependencies are ready
              * @param {Function} [error] Callback to execute if one or more dependencies failed
-             * @return {JQuery.Promise} With a `require` function
+             * @returns {JQuery.Promise} With a `require` function
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-using
              */
             function using(
@@ -370,7 +367,7 @@ declare global {
              * @param {string} url URL
              * @param {string} [media] Media attribute
              * @param {Node|null} [nextNode]
-             * @return {HTMLLinkElement}
+             * @returns {HTMLLinkElement}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/source/mediawiki.loader.html#global-method-addLinkTag
              */
             function addLinkTag(
@@ -387,7 +384,7 @@ declare global {
              * @param {Function} [callback] Callback to run after request resolution
              * @param {string[]} [modules] List of modules being requested, for state to be marked as error
              * in case the script fails to load
-             * @return {HTMLScriptElement}
+             * @returns {HTMLScriptElement}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/source/mediawiki.loader.html#mw-loader-method-addScriptTag
              */
             function addScriptTag(
@@ -434,7 +431,7 @@ declare global {
              *
              * @private
              * @param {string[]} modules Array of string module names
-             * @return {Array} List of dependencies, including 'module'.
+             * @returns {Array} List of dependencies, including 'module'.
              * @throws {Error} If an unregistered module or a dependency loop is encountered
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader-method-resolve
              */
@@ -491,7 +488,7 @@ declare global {
                  * Retrieve a module from the store and update cache hit stats.
                  *
                  * @param {string} module Module name
-                 * @return {string|boolean} Module implementation or false if unavailable
+                 * @returns {string|boolean} Module implementation or false if unavailable
                  * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-get
                  */
                 function get(module: string): string | false;
@@ -524,7 +521,7 @@ declare global {
                 /**
                  * Construct a JSON-serializable object representing the content of the store.
                  *
-                 * @return {Object} Module store contents.
+                 * @returns {Object} Module store contents.
                  * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-toJSON
                  */
                 function toJSON(): { items: string; vary: string; asOf: number };
@@ -602,7 +599,6 @@ declare global {
                  * be called if the store is enabled.
                  *
                  * @private
-                 * @method
                  * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.loader.store-method-requestUpdate
                  */
                 function requestUpdate(): void;
diff --git a/mw/log.d.ts b/mw/log.d.ts
index b301654..822bda2 100644
--- a/mw/log.d.ts
+++ b/mw/log.d.ts
@@ -29,7 +29,6 @@ declare global {
              *
              * See {@link mw.log} for other logging methods.
              *
-             * @member mw
              * @param {...string} msg Messages to output to console.
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-log
              */
@@ -98,7 +97,7 @@ declare global {
              * @param {string|null} key Name of the feature for deprecation tracker,
              *  or null for a console-only deprecation.
              * @param {string} msg Deprecation warning.
-             * @return {Function}
+             * @returns {Function}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-makeDeprecated
              */
             makeDeprecated(key: string | null, msg: string): () => void;
diff --git a/mw/message.d.ts b/mw/message.d.ts
index f4c93a3..c3ec517 100644
--- a/mw/message.d.ts
+++ b/mw/message.d.ts
@@ -7,7 +7,7 @@ declare global {
          *
          * @param {string} key Key of message to get
          * @param {...Mixed} parameters Values for $N replacements
-         * @return {Message}
+         * @returns {Message}
          * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-message
          */
         function message(key: string, ...parameters: any[]): Message;
@@ -15,7 +15,6 @@ declare global {
         /**
          * Store for messages.
          *
-         * @property {Map}
          * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-property-messages
          */
         const messages: Map<{ [key: string]: string }>;
@@ -117,7 +116,7 @@ declare global {
              *
              * This is equivalent to the {@link text} format, which is then HTML-escaped.
              *
-             * @return {string} String form of html escaped message
+             * @returns {string} String form of html escaped message
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-escaped
              */
             escaped(): string;
@@ -125,7 +124,7 @@ declare global {
             /**
              * Check if a message exists
              *
-             * @return {boolean}
+             * @returns {boolean}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-exists
              */
             exists(): boolean;
@@ -136,7 +135,7 @@ declare global {
              * This method is only available when jqueryMsg is loaded.
              *
              * @since 1.41
-             * @return {boolean}
+             * @returns {boolean}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-isParseable
              */
             isParseable(): boolean;
@@ -145,8 +144,7 @@ declare global {
              * Add (does not replace) parameters for `$N` placeholder values.
              *
              * @param {Array} parameters
-             * @return {Message}
-             * @chainable
+             * @returns {Message}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-params
              */
             params(parameters: any[]): this;
@@ -157,7 +155,7 @@ declare global {
              * If jqueryMsg is loaded, this transforms text and parses a subset of supported wikitext
              * into HTML. Without jqueryMsg, it is equivalent to {@link escaped}.
              *
-             * @return {string} String form of parsed message
+             * @returns {string} String form of parsed message
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-parse
              */
             parse(): string;
@@ -168,7 +166,7 @@ declare global {
              * This method is only available when jqueryMsg is loaded.
              *
              * @since 1.27
-             * @return {JQuery}
+             * @returns {JQuery}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-parseDom
              */
             parseDom(): JQuery;
@@ -184,10 +182,10 @@ declare global {
              *
              * @private For internal use by mediawiki.jqueryMsg only
              * @param {string} format
-             * @return {string} Parsed message
+             * @returns {string} Parsed message
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-parser
              */
-            parser(format: string): string;
+            private parser(format: string): string;
 
             /**
              * Return message plainly.
@@ -195,7 +193,7 @@ declare global {
              * This substitutes parameters, but otherwise does not transform the
              * message content.
              *
-             * @return {string} String form of plain message
+             * @returns {string} String form of plain message
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-plain
              */
             plain(): string;
@@ -207,7 +205,7 @@ declare global {
              * magic words such as `{{plural:}}`, `{{gender:}}`, and `{{int:}}`.
              * Without jqueryMsg, it is equivalent to {@link plain}.
              *
-             * @return {string} String form of text message
+             * @returns {string} String form of text message
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-text
              */
             text(): string;
@@ -219,14 +217,13 @@ declare global {
              * Do not call this directly. Use {@link mw.Message.text()} instead, one of the
              * other format methods.
              *
-             * @private
              * @param {string} [format="text"] Internal parameter. Uses "text" if called
              *  implicitly through string casting.
-             * @return {string} Message in the given format, or `⧼key⧽` if the key
+             * @returns {string} Message in the given format, or `⧼key⧽` if the key
              *  does not exist.
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Message-method-toString
              */
-            toString(format?: "escaped" | "parse" | "plain" | "text"): string;
+            private toString(format?: "escaped" | "parse" | "plain" | "text"): string;
         }
 
         /**
@@ -236,7 +233,7 @@ declare global {
          *
          * @param {string} key Key of message to get
          * @param {...Mixed} parameters Values for $N replacements
-         * @return {string}
+         * @returns {string}
          * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-msg
          */
         function msg(key: string, ...parameters: any[]): string;
diff --git a/mw/notification.d.ts b/mw/notification.d.ts
index d9a83b7..d0f53dc 100644
--- a/mw/notification.d.ts
+++ b/mw/notification.d.ts
@@ -113,7 +113,7 @@ declare global {
          * @param {HTMLElement|HTMLElement[]|JQuery|Message|string} message
          * @param {Object} [options] The options to use for the notification.
          *  See {@link NotificationOptions defaults} for details.
-         * @return {JQuery.Promise} Notification object
+         * @returns {JQuery.Promise} Notification object
          * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw-method-notify
          */
         function notify(
@@ -172,7 +172,7 @@ declare global {
              * @param {HTMLElement|HTMLElement[]|JQuery|Message|string} message
              * @param {Object} [options] The options to use for the notification.
              *  See {@link NotificationOptions defaults} for details.
-             * @return {Notification} Notification object
+             * @returns {Notification} Notification object
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.notification-method-notify
              */
             function notify(
diff --git a/mw/storage.d.ts b/mw/storage.d.ts
index f5440f8..c8be39e 100644
--- a/mw/storage.d.ts
+++ b/mw/storage.d.ts
@@ -11,7 +11,7 @@ interface SafeStorage {
      * Retrieve value from device storage.
      *
      * @param {string} key Key of item to retrieve
-     * @return {string|null|boolean} String value, null if no value exists, or false
+     * @returns {string|null|boolean} String value, null if no value exists, or false
      *  if storage is not available.
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-get
      */
@@ -21,7 +21,7 @@ interface SafeStorage {
      * Retrieve JSON object from device storage.
      *
      * @param {string} key Key of item to retrieve
-     * @return {Object|null|boolean} Object, null if no value exists or value
+     * @returns {Object|null|boolean} Object, null if no value exists or value
      *  is not JSON-parseable, or false if storage is not available.
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-getObject
      */
@@ -31,7 +31,7 @@ interface SafeStorage {
      * Remove a value from device storage.
      *
      * @param {string} key Key of item to remove
-     * @return {boolean} Whether the key was removed
+     * @returns {boolean} Whether the key was removed
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-remove
      */
     remove(key: string): boolean;
@@ -42,7 +42,7 @@ interface SafeStorage {
      * @param {string} key Key name to store under
      * @param {string} value Value to be stored
      * @param {number} [expiry] Number of seconds after which this item can be deleted
-     * @return {boolean} The value was set
+     * @returns {boolean} The value was set
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-set
      */
     set(key: string, value: string, expiry?: number): boolean;
@@ -54,7 +54,7 @@ interface SafeStorage {
      * @param {number} [expiry] Number of seconds after which this item can be deleted,
      *  omit to clear the expiry (either making the item never expire, or to clean up
      *  when deleting a key).
-     * @return {boolean} The expiry was set (or cleared) [since 1.41]
+     * @returns {boolean} The expiry was set (or cleared) [since 1.41]
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-setExpires
      */
     setExpires(key: string, expiry?: number): boolean;
@@ -65,7 +65,7 @@ interface SafeStorage {
      * @param {string} key Key name to store under
      * @param {Object} value Object value to be stored
      * @param {number} [expiry] Number of seconds after which this item can be deleted
-     * @return {boolean} The value was set
+     * @returns {boolean} The value was set
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-setObject
      */
     setObject(key: string, value: any, expiry?: number): boolean;
@@ -74,7 +74,7 @@ interface SafeStorage {
      * Clear any expired items from the store
      *
      * @private
-     * @return {JQuery.Promise} Resolves when items have been expired
+     * @returns {JQuery.Promise} Resolves when items have been expired
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-clearExpired
      */
     clearExpired(): JQuery.Promise<undefined>;
@@ -83,7 +83,7 @@ interface SafeStorage {
      * Get all keys with expiry values
      *
      * @private
-     * @return {JQuery.Promise} Promise resolving with all the keys which have
+     * @returns {JQuery.Promise} Promise resolving with all the keys which have
      *  expiry values (unprefixed), or as many could be retrieved in the allocated time.
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-getExpiryKeys
      */
@@ -94,7 +94,7 @@ interface SafeStorage {
      *
      * @private
      * @param {string} key Key name
-     * @return {boolean} Whether key is expired
+     * @returns {boolean} Whether key is expired
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.SafeStorage-method-isExpired
      */
     isExpired(key: string): boolean;
diff --git a/mw/template.d.ts b/mw/template.d.ts
index 31f6693..20a197f 100644
--- a/mw/template.d.ts
+++ b/mw/template.d.ts
@@ -1,7 +1,7 @@
 type CompiledTemplate = any; // Can this be made more specific?
 
 interface Compiler {
-    compile: (src: string) => CompiledTemplate;
+    compile(src: string): CompiledTemplate;
 }
 
 declare global {
@@ -21,7 +21,7 @@ declare global {
              * The compiler name must correspond with the name suffix of templates that use this compiler.
              *
              * @param {string} name Compiler name
-             * @param {Object} compiler
+             * @param {Compiler} compiler
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-registerCompiler
              */
             function registerCompiler(name: string, compiler: Compiler): void;
@@ -30,7 +30,7 @@ declare global {
              * Get the name of the associated compiler based on a template name.
              *
              * @param {string} templateName Name of a template (including suffix)
-             * @return {string} Name of a compiler
+             * @returns {string} Name of a compiler
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-getCompilerName
              */
             function getCompilerName(templateName: string): string;
@@ -39,7 +39,7 @@ declare global {
              * Get a compiler via its name.
              *
              * @param {string} name Name of a compiler
-             * @return {Object} The compiler
+             * @returns {Compiler} The compiler
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-getCompiler
              */
             function getCompiler(name: string): Compiler;
@@ -52,7 +52,7 @@ declare global {
              * @param {string} moduleName Name of the ResourceLoader module the template is associated with
              * @param {string} templateName Name of the template (including suffix)
              * @param {string} templateBody Contents of the template (e.g. html markup)
-             * @return {Object} Compiled template
+             * @returns {CompiledTemplate} Compiled template
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-add
              */
             function add(
@@ -66,7 +66,7 @@ declare global {
              *
              * @param {string} moduleName Name of the module to retrieve the template from
              * @param {string} templateName Name of template to be retrieved
-             * @return {Object} Compiled template
+             * @returns {CompiledTemplate} Compiled template
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-get
              */
             function get(moduleName: string, templateName: string): CompiledTemplate;
@@ -76,7 +76,7 @@ declare global {
              *
              * @param {string} templateBody Template body
              * @param {string} compilerName The name of a registered compiler
-             * @return {Object} Compiled template
+             * @returns {CompiledTemplate} Compiled template
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.template-method-compile
              */
             function compile(templateBody: string, compilerName: string): CompiledTemplate;
diff --git a/mw/user.d.ts b/mw/user.d.ts
index 2175e61..9312e35 100644
--- a/mw/user.d.ts
+++ b/mw/user.d.ts
@@ -34,7 +34,7 @@ export interface User {
      * will be used for their account. It may also be used in previews. However, the account is not
      * created yet, and the name is not visible to other users.
      *
-     * @return {JQuery.Promise} Promise resolved with the username if we succeeded,
+     * @returns {JQuery.Promise} Promise resolved with the username if we succeeded,
      *   or resolved with `null` if we failed
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-acquireTempUserName
      */
@@ -60,7 +60,7 @@ export interface User {
      * See https://en.wikipedia.org/wiki/Birthday_attack#Mathematics
      * n(p;H) = n(0.01,2^80)= sqrt (2 * 2^80 * ln(1/(1-0.01)))
      *
-     * @return {string} 80 bit integer (20 characters) in hex format, padded
+     * @returns {string} 80 bit integer (20 characters) in hex format, padded
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-generateRandomSessionId
      */
     generateRandomSessionId(): string;
@@ -69,7 +69,7 @@ export interface User {
      * Get the current user's groups
      *
      * @param {Function} [callback]
-     * @return {JQuery.Promise}
+     * @returns {JQuery.Promise}
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getGroups
      */
     getGroups(callback: (groups: string[]) => any): JQuery.Promise<undefined>;
@@ -80,7 +80,7 @@ export interface User {
      *
      * Not to be confused with {@link id}.
      *
-     * @return {number} Current user's id, or 0 if user is anonymous
+     * @returns {number} Current user's id, or 0 if user is anonymous
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getId
      */
     getId(): number;
@@ -88,7 +88,7 @@ export interface User {
     /**
      * Get the current user's name
      *
-     * @return {string|null} User name string or null if user is anonymous
+     * @returns {string|null} User name string or null if user is anonymous
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getName
      */
     getName(): string | null;
@@ -98,7 +98,7 @@ export interface User {
      * cached within this class (also known as a page view token).
      *
      * @since 1.32
-     * @return {string} 80 bit integer in hex format, padded
+     * @returns {string} 80 bit integer in hex format, padded
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getPageviewToken
      */
     getPageviewToken(): string;
@@ -106,7 +106,7 @@ export interface User {
     /**
      * Get date user registered, if available
      *
-     * @return {boolean|null|Date} False for anonymous users, null if data is
+     * @returns {false|null|Date} False for anonymous users, null if data is
      *  unavailable, or Date for when the user registered.
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getRegistration
      */
@@ -116,7 +116,7 @@ export interface User {
      * Get the current user's rights
      *
      * @param {Function} [callback]
-     * @return {JQuery.Promise}
+     * @returns {JQuery.Promise}
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getRights
      */
     getRights(callback: (rights: string[]) => any): JQuery.Promise<undefined>;
@@ -127,7 +127,7 @@ export interface User {
      *
      * Not to be confused with {@link getId}.
      *
-     * @return {string} User name or random session ID
+     * @returns {string} User name or random session ID
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-id
      */
     id(): string;
@@ -135,7 +135,7 @@ export interface User {
     /**
      * Whether the current user is anonymous
      *
-     * @return {boolean}
+     * @returns {boolean}
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-isAnon
      */
     isAnon(): boolean;
@@ -143,7 +143,7 @@ export interface User {
     /**
      * Is the user a normal non-temporary registered user?
      *
-     * @return {boolean}
+     * @returns {boolean}
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-isNamed
      */
     isNamed(): boolean;
@@ -151,7 +151,7 @@ export interface User {
     /**
      * Is the user an autocreated temporary user?
      *
-     * @return {boolean}
+     * @returns {boolean}
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-isTemp
      */
     isTemp(): boolean;
@@ -165,7 +165,7 @@ export interface User {
      *
      * **Note:** Server-side code must never interpret or modify this value.
      *
-     * @return {string} Random session ID (20 hex characters)
+     * @returns {string} Random session ID (20 hex characters)
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-sessionId
      */
     sessionId(): string;
@@ -174,7 +174,7 @@ export interface User {
      * Get the current user's groups or rights
      *
      * @private
-     * @return {JQuery.Promise}
+     * @returns {JQuery.Promise}
      * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.user-method-getUserInfo
      */
     getUserInfo(): JQuery.Promise<UserInfo>;
diff --git a/mw/util.d.ts b/mw/util.d.ts
index ce56a10..d0fb872 100644
--- a/mw/util.d.ts
+++ b/mw/util.d.ts
@@ -57,7 +57,7 @@ declare global {
              * See also [MDN: CSSStyleSheet](https://developer.mozilla.org/en-US/docs/Web/API/CSSStyleSheet).
              *
              * @param {string} text CSS to be appended
-             * @return {CSSStyleSheet} The sheet object
+             * @returns {CSSStyleSheet} The sheet object
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-addCSS
              */
             function addCSS(text: string): CSSStyleSheet;
@@ -69,7 +69,7 @@ declare global {
              * @param {string} [label] of the new portlet.
              * @param {string} [before] selector of the element preceding the new portlet. If not passed
              *  the caller is responsible for appending the element to the DOM before using addPortletLink.
-             * @return {HTMLElement|null} will be null if it was not possible to create an portlet with
+             * @returns {HTMLElement|null} will be null if it was not possible to create an portlet with
              *  the required information e.g. the selector given in before parameter could not be resolved
              *  to an existing element in the page.
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-addPortlet
@@ -140,7 +140,7 @@ declare global {
              *  Must be another item in the same list, it will be ignored otherwise.
              *  Can be specified as DOM reference, as jQuery object, or as CSS selector string.
              * @fires util_addPortletLink
-             * @return {HTMLLIElement|null} The added list item, or null if no element was added.
+             * @returns {HTMLLIElement|null} The added list item, or null if no element was added.
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-addPortletLink
              */
             function addPortletLink(
@@ -183,7 +183,7 @@ declare global {
              * @param {Function} func Function to debounce
              * @param {number} [wait=0] Wait period in milliseconds
              * @param {boolean} [immediate] Trigger on leading edge
-             * @return {Function} Debounced function
+             * @returns {Function} Debounced function
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-debounce
              */
             function debounce<T extends (...args: any[]) => any>(
@@ -203,7 +203,7 @@ declare global {
              *
              * @since 1.30
              * @param {string} str String to encode
-             * @return {string} Encoded string
+             * @returns {string} Encoded string
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-escapeIdForAttribute
              */
             function escapeIdForAttribute(str: string): string;
@@ -215,7 +215,7 @@ declare global {
              *
              * @since 1.30
              * @param {string} str String to encode
-             * @return {string} Encoded string
+             * @returns {string} Encoded string
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-escapeIdForLink
              */
             function escapeIdForLink(str: string): string;
@@ -225,11 +225,13 @@ declare global {
              *
              * The following characters are escaped:
              *
-             *     \ { } ( ) | . ? * + - ^ $ [ ]
+             * ```text
+             * \ { } ( ) | . ? * + - ^ $ [ ]
+             * ```
              *
-             * @since 1.26; moved to mw.util in 1.34
+             * @since 1.26; moved to {@link mw.util} in 1.34
              * @param {string} str String to escape
-             * @return {string} Escaped string
+             * @returns {string} Escaped string
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-escapeRegExp
              */
             function escapeRegExp(str: string): string;
@@ -247,7 +249,7 @@ declare global {
              *
              * @param {string} param The parameter name.
              * @param {URLSearchParams} [params] Parsed URL parameters to search through, defaulting to the current browsing location.
-             * @return {string[]|null} Parameter value, or null if parameter was not found.
+             * @returns {string[]|null} Parameter value, or null if parameter was not found.
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-getArrayParam
              */
             function getArrayParam(param: string, params?: URLSearchParams): string[] | null;
@@ -263,7 +265,7 @@ declare global {
              *
              * @param {string} param The parameter name.
              * @param {string} [url=location.href] URL to search through, defaulting to the current browsing location.
-             * @return {string|null} Parameter value, or null if parameter was not found.
+             * @returns {string|null} Parameter value, or null if parameter was not found.
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-getParamValue
              */
             function getParamValue(param: string, url?: string): string | null;
@@ -272,7 +274,7 @@ declare global {
              * Get the target element from a link hash
              *
              * This is the same element as you would get from
-             * document.querySelectorAll(':target'), but can be used on
+             * `document.querySelectorAll(':target')`, but can be used on
              * an arbitrary hash fragment, or after pushState/replaceState
              * has been used.
              *
@@ -285,7 +287,7 @@ declare global {
              *
              * @param {string} [hash] Hash fragment, without the leading '#'.
              *  Taken from location.hash if omitted.
-             * @return {HTMLElement|null} Element, if found
+             * @returns {HTMLElement|null} Element, if found
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-getTargetFromFragment
              */
             function getTargetFromFragment(hash?: string): HTMLElement | null;
@@ -296,7 +298,7 @@ declare global {
              * @param {string|null} [pageName=wgPageName] Page name
              * @param {Object} [params] A mapping of query parameter names to values,
              *  e.g. `{ action: 'edit' }`
-             * @return {string} URL, relative to `wgServer`.
+             * @returns {string} URL, relative to `wgServer`.
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-getUrl
              */
             // params are handled by $.param, which converts any value to a string. However, instead of using toString(),
@@ -320,7 +322,7 @@ declare global {
              * @since 1.25
              * @param {string} address String to check
              * @param {boolean} [allowBlock=false] If a block of IPs should be allowed
-             * @return {boolean}
+             * @returns {boolean}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-isIPAddress
              */
             function isIPAddress(address: string, allowBlock?: boolean): boolean;
@@ -342,7 +344,7 @@ declare global {
              *
              * @param {string} address
              * @param {boolean} [allowBlock=false]
-             * @return {boolean}
+             * @returns {boolean}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-isIPv4Address
              */
             function isIPv4Address(
@@ -371,7 +373,7 @@ declare global {
              *
              * @param {string} address
              * @param {boolean} [allowBlock=false]
-             * @return {boolean}
+             * @returns {boolean}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-isIPv6Address
              */
             function isIPv6Address(address: string, allowBlock?: boolean): boolean;
@@ -380,7 +382,7 @@ declare global {
              * Is a portlet visible?
              *
              * @param {string} portletId ID of the target portlet (e.g. 'p-cactions' or 'p-personal')
-             * @return {boolean}
+             * @returns {boolean}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-isPortletVisible
              */
             function isPortletVisible(portletId: string): boolean;
@@ -388,10 +390,10 @@ declare global {
             /**
              * Does given username match $wgAutoCreateTempUser?
              *
-             * This functionality has been adapted from MediaWiki\User\TempUser\Pattern::isMatch()
+             * This functionality has been adapted from `MediaWiki\User\TempUser\Pattern::isMatch()`
              *
              * @param {string} username
-             * @return {boolean}
+             * @returns {boolean}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-isTemporaryUser
              */
             function isTemporaryUser(username: string): boolean;
@@ -402,12 +404,12 @@ declare global {
              * the image.
              *
              * @param {string} url URL to parse (URL-encoded)
-             * @return {Object|null} URL data, or null if the URL is not a valid MediaWiki
+             * @returns {Object|null} URL data, or null if the URL is not a valid MediaWiki
              *   image/thumbnail URL.
-             * @return {string} return.name File name (same format as Title.getMainText()).
-             * @return {number} [return.width] Thumbnail width, in pixels. Null when the file is not
+             * @returns {string} return.name File name (same format as Title.getMainText()).
+             * @returns {number} [return.width] Thumbnail width, in pixels. Null when the file is not
              *   a thumbnail.
-             * @return {function(number):string} [return.resizeUrl] A function that takes a width
+             * @returns {function(number):string} [return.resizeUrl] A function that takes a width
              *   parameter and returns a thumbnail URL (URL-encoded) with that width. The width
              *   parameter must be smaller than the width of the original image (or equal to it; that
              *   only works if MediaHandler::mustRender returns true for the file). Null when the
@@ -428,16 +430,16 @@ declare global {
              * Percent-decode a string, as found in a URL hash fragment
              *
              * Implements the percent-decode method as defined in
-             * https://url.spec.whatwg.org/#percent-decode.
+             * {@link https://url.spec.whatwg.org/#percent-decode}.
              *
-             * URLSearchParams implements https://url.spec.whatwg.org/#concept-urlencoded-parser
+             * URLSearchParams implements {@link https://url.spec.whatwg.org/#concept-urlencoded-parser}
              * which performs a '+' to ' ' substitution before running percent-decode.
              *
              * To get the desired behaviour we percent-encode any '+' in the fragment
              * to effectively expose the percent-decode implementation.
              *
              * @param {string} text Text to decode
-             * @return {string|null} Decoded text, null if decoding failed
+             * @returns {string|null} Decoded text, null if decoding failed
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-percentDecodeFragment
              */
             function percentDecodeFragment(text: string): string | null;
@@ -447,10 +449,10 @@ declare global {
              *
              * This will make it more compact and lower-case.
              *
-             * This functionality has been adapted from \Wikimedia\IPUtils::prettifyIP()
+             * This functionality has been adapted from `\Wikimedia\IPUtils::prettifyIP()`
              *
              * @param {string} ip IP address in quad or octet form (CIDR or not).
-             * @return {string|null}
+             * @returns {string|null}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-prettifyIP
              */
             function prettifyIP(ip: string): string | null;
@@ -459,7 +461,7 @@ declare global {
              * Encode the string like PHP's rawurlencode
              *
              * @param {string} str String to be encoded.
-             * @return {string} Encoded string
+             * @returns {string} Encoded string
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-rawurlencode
              */
             function rawurlencode(str: string): string;
@@ -471,10 +473,10 @@ declare global {
              * IPv6 addresses in octet notation are expanded to 8 words;
              * IPv4 addresses have leading zeros, in each octet, removed.
              *
-             * This functionality has been adapted from \Wikimedia\IPUtils::sanitizeIP()
+             * This functionality has been adapted from `\Wikimedia\IPUtils::sanitizeIP()`
              *
              * @param {string} ip IP address in quad or octet form (CIDR or not).
-             * @return {string|null}
+             * @returns {string|null}
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-sanitizeIP
              */
             function sanitizeIP(ip: string): string | null;
@@ -500,7 +502,7 @@ declare global {
              *
              * @param {Function} func Function to throttle
              * @param {number} wait Throttle window length, in milliseconds
-             * @return {Function} Throttled function
+             * @returns {Function} Throttled function
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-throttle
              */
             function throttle<T extends (...args: any[]) => any>(
@@ -518,7 +520,7 @@ declare global {
              * ```
              *
              * @param {string} email E-mail address
-             * @return {boolean|null} True if valid, false if invalid, null if `email` was empty.
+             * @returns {boolean|null} True if valid, false if invalid, null if `email` was empty.
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-validateEmail
              */
             function validateEmail(email: string): boolean | null;
@@ -530,7 +532,7 @@ declare global {
              *
              * @since 1.18
              * @param {string} [str="index"] Name of entry point (e.g. 'index' or 'api')
-             * @return {string} URL to the script file (e.g. `/w/api.php`)
+             * @returns {string} URL to the script file (e.g. `/w/api.php`)
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-wikiScript
              */
             function wikiScript(str?: string): string;
@@ -545,7 +547,7 @@ declare global {
              * non-canonical URL.
              *
              * @param {string} str String to be encoded.
-             * @return {string} Encoded string
+             * @returns {string} Encoded string
              * @see https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.util-method-wikiUrlencode
              */
             function wikiUrlencode(str: string): string;