diff --git a/src/wp-includes/blocks/categories.php b/src/wp-includes/blocks/categories.php
index 7e3979b7aefe2..c35376505b134 100644
--- a/src/wp-includes/blocks/categories.php
+++ b/src/wp-includes/blocks/categories.php
@@ -70,8 +70,7 @@ function render_block_core_categories( $attributes ) {
 function build_dropdown_script_block_core_categories( $dropdown_id ) {
 	ob_start();
 	?>
-	<script type='text/javascript'>
-	/* <![CDATA[ */
+	<script>
 	( function() {
 		var dropdown = document.getElementById( '<?php echo esc_js( $dropdown_id ); ?>' );
 		function onCatChange() {
@@ -81,10 +80,9 @@ function onCatChange() {
 		}
 		dropdown.onchange = onCatChange;
 	})();
-	/* ]]> */
 	</script>
 	<?php
-	return ob_get_clean();
+	return wp_get_inline_script_tag( str_replace( array( '<script>', '</script>' ), '', ob_get_clean() ) );
 }
 
 /**
diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php
index 5f588a0cd4a00..aebcfeb892dfb 100644
--- a/src/wp-includes/class-wp-customize-manager.php
+++ b/src/wp-includes/class-wp-customize-manager.php
@@ -464,19 +464,17 @@ protected function wp_die( $ajax_message, $message = null ) {
 				),
 				'error'         => $ajax_message,
 			);
-			wp_print_inline_script_tag(
-				static function () use ( $settings ) {
-					?>
-					<script>
-					( function( api, settings ) {
-						var preview = new api.Messenger( settings.messengerArgs );
-						preview.send( 'iframe-loading-error', settings.error );
-					} )( wp.customize, <?php echo wp_json_encode( $settings ); ?> );
-					</script>
-					<?php
-				}
-			);
 			$message .= ob_get_clean();
+			ob_start();
+			?>
+			<script>
+			( function( api, settings ) {
+				var preview = new api.Messenger( settings.messengerArgs );
+				preview.send( 'iframe-loading-error', settings.error );
+			} )( wp.customize, <?php echo wp_json_encode( $settings ); ?> );
+			</script>
+			<?php
+			$message .= wp_get_inline_script_tag( str_replace( array( '<script>', '</script>' ), '', ob_get_clean() ) );
 		}
 
 		wp_die( $message );
@@ -2087,33 +2085,31 @@ public function remove_frameless_preview_messenger_channel() {
 		if ( ! $this->messenger_channel ) {
 			return;
 		}
-		wp_print_inline_script_tag(
-			static function () {
-				?>
-				<script>
-				( function() {
-					var urlParser, oldQueryParams, newQueryParams, i;
-					if ( parent !== window ) {
-						return;
-					}
-					urlParser = document.createElement( 'a' );
-					urlParser.href = location.href;
-					oldQueryParams = urlParser.search.substr( 1 ).split( /&/ );
-					newQueryParams = [];
-					for ( i = 0; i < oldQueryParams.length; i += 1 ) {
-						if ( ! /^customize_messenger_channel=/.test( oldQueryParams[ i ] ) ) {
-							newQueryParams.push( oldQueryParams[ i ] );
-						}
-					}
-					urlParser.search = newQueryParams.join( '&' );
-					if ( urlParser.search !== location.search ) {
-						location.replace( urlParser.href );
-					}
-				} )();
-				</script>
-				<?php
+		ob_start();
+		?>
+		<script>
+		( function() {
+			var urlParser, oldQueryParams, newQueryParams, i;
+			if ( parent !== window ) {
+				return;
 			}
-		);
+			urlParser = document.createElement( 'a' );
+			urlParser.href = location.href;
+			oldQueryParams = urlParser.search.substr( 1 ).split( /&/ );
+			newQueryParams = [];
+			for ( i = 0; i < oldQueryParams.length; i += 1 ) {
+				if ( ! /^customize_messenger_channel=/.test( oldQueryParams[ i ] ) ) {
+					newQueryParams.push( oldQueryParams[ i ] );
+				}
+			}
+			urlParser.search = newQueryParams.join( '&' );
+			if ( urlParser.search !== location.search ) {
+				location.replace( urlParser.href );
+			}
+		} )();
+		</script>
+		<?php
+		wp_print_inline_script_tag( str_replace( array( '<script>', '</script>' ), '', ob_get_clean() ) );
 	}
 
 	/**
@@ -2209,34 +2205,32 @@ public function customize_preview_settings() {
 			}
 		}
 
-		wp_print_inline_script_tag(
-			function () use ( $settings ) {
-				?>
-				<script>
-				var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
-				_wpCustomizeSettings.values = {};
-				(function( v ) {
-					<?php
-					/*
-					 * Serialize settings separately from the initial _wpCustomizeSettings
-					 * serialization in order to avoid a peak memory usage spike.
-					 * @todo We may not even need to export the values at all since the pane syncs them anyway.
-					 */
-					foreach ( $this->settings as $id => $setting ) {
-						if ( $setting->check_capabilities() ) {
-							printf(
-								"v[%s] = %s;\n",
-								wp_json_encode( $id ),
-								wp_json_encode( $setting->js_value() )
-							);
-						}
-					}
-					?>
-				})( _wpCustomizeSettings.values );
-				</script>
+		ob_start();
+		?>
+		<script>
+			var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+			_wpCustomizeSettings.values = {};
+			(function( v ) {
 				<?php
-			}
-		);
+				/*
+				 * Serialize settings separately from the initial _wpCustomizeSettings
+				 * serialization in order to avoid a peak memory usage spike.
+				 * @todo We may not even need to export the values at all since the pane syncs them anyway.
+				 */
+				foreach ( $this->settings as $id => $setting ) {
+					if ( $setting->check_capabilities() ) {
+						printf(
+							"v[%s] = %s;\n",
+							wp_json_encode( $id ),
+							wp_json_encode( $setting->js_value() )
+						);
+					}
+				}
+				?>
+			})( _wpCustomizeSettings.values );
+		</script>
+		<?php
+		wp_print_inline_script_tag( str_replace( array( '<script>', '</script>' ), '', ob_get_clean() ) );
 	}
 
 	/**
@@ -4988,46 +4982,44 @@ public function customize_pane_settings() {
 			}
 		}
 
-		wp_print_inline_script_tag(
-			function () use ( $settings ) {
-				?>
-				<script>
-				var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
-				_wpCustomizeSettings.initialClientTimestamp = _.now();
-				_wpCustomizeSettings.controls = {};
-				_wpCustomizeSettings.settings = {};
-				<?php
-
-				// Serialize settings one by one to improve memory usage.
-				echo "(function ( s ){\n";
-				foreach ( $this->settings() as $setting ) {
-					if ( $setting->check_capabilities() ) {
-						printf(
-							"s[%s] = %s;\n",
-							wp_json_encode( $setting->id ),
-							wp_json_encode( $setting->json() )
-						);
-					}
+		ob_start();
+		?>
+		<script>
+			var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+			_wpCustomizeSettings.initialClientTimestamp = _.now();
+			_wpCustomizeSettings.controls = {};
+			_wpCustomizeSettings.settings = {};
+			<?php
+
+			// Serialize settings one by one to improve memory usage.
+			echo "(function ( s ){\n";
+			foreach ( $this->settings() as $setting ) {
+				if ( $setting->check_capabilities() ) {
+					printf(
+						"s[%s] = %s;\n",
+						wp_json_encode( $setting->id ),
+						wp_json_encode( $setting->json() )
+					);
 				}
-				echo "})( _wpCustomizeSettings.settings );\n";
+			}
+			echo "})( _wpCustomizeSettings.settings );\n";
 
-				// Serialize controls one by one to improve memory usage.
-				echo "(function ( c ){\n";
-				foreach ( $this->controls() as $control ) {
-					if ( $control->check_capabilities() ) {
-						printf(
-							"c[%s] = %s;\n",
-							wp_json_encode( $control->id ),
-							wp_json_encode( $control->json() )
-						);
-					}
+			// Serialize controls one by one to improve memory usage.
+			echo "(function ( c ){\n";
+			foreach ( $this->controls() as $control ) {
+				if ( $control->check_capabilities() ) {
+					printf(
+						"c[%s] = %s;\n",
+						wp_json_encode( $control->id ),
+						wp_json_encode( $control->json() )
+					);
 				}
-				echo "})( _wpCustomizeSettings.controls );\n";
-				?>
-				</script>
-				<?php
 			}
-		);
+			echo "})( _wpCustomizeSettings.controls );\n";
+			?>
+		</script>
+		<?php
+		wp_print_inline_script_tag( str_replace( array( '<script>', '</script>' ), '', ob_get_clean() ) );
 	}
 
 	/**
diff --git a/src/wp-includes/class-wp-customize-widgets.php b/src/wp-includes/class-wp-customize-widgets.php
index 93006ef91671e..8e2de7e0d64fa 100644
--- a/src/wp-includes/class-wp-customize-widgets.php
+++ b/src/wp-includes/class-wp-customize-widgets.php
@@ -1310,12 +1310,10 @@ public function export_preview_data() {
 		foreach ( $settings['registeredWidgets'] as &$registered_widget ) {
 			unset( $registered_widget['callback'] ); // May not be JSON-serializeable.
 		}
-
-		?>
-		<script type="text/javascript">
-			var _wpWidgetCustomizerPreviewSettings = <?php echo wp_json_encode( $settings ); ?>;
-		</script>
-		<?php
+		wp_print_inline_script_tag(
+			// language=JavaScript
+			sprintf( 'var _wpWidgetCustomizerPreviewSettings = %s;', wp_json_encode( $settings ) )
+		);
 	}
 
 	/**
diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index 15b412f5615dd..bd73540bc9e16 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -973,42 +973,38 @@ public static function print_default_editor_scripts() {
 			$settings = '{}';
 		}
 
-		wp_print_inline_script_tag(
-			static function () use ( $settings, $user_can_richedit ) {
-				?>
-				<script>
-				window.wp = window.wp || {};
-				window.wp.editor = window.wp.editor || {};
-				window.wp.editor.getDefaultSettings = function() {
-					return {
-						tinymce: <?php echo $settings; ?>,
-						quicktags: {
-							buttons: 'strong,em,link,ul,ol,li,code'
-						}
-					};
-				};
-
-				<?php
-
-				if ( $user_can_richedit ) {
-					$suffix  = SCRIPT_DEBUG ? '' : '.min';
-					$baseurl = self::get_baseurl();
-
-					?>
-					var tinyMCEPreInit = {
-						baseURL: "<?php echo $baseurl; ?>",
-						suffix: "<?php echo $suffix; ?>",
-						mceInit: {},
-						qtInit: {},
-						load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
-					};
-					<?php
+		?>
+		<script type="text/javascript">
+		window.wp = window.wp || {};
+		window.wp.editor = window.wp.editor || {};
+		window.wp.editor.getDefaultSettings = function() {
+			return {
+				tinymce: <?php echo $settings; ?>,
+				quicktags: {
+					buttons: 'strong,em,link,ul,ol,li,code'
 				}
-				?>
-				</script>
-				<?php
-			}
-		);
+			};
+		};
+
+		<?php
+
+		if ( $user_can_richedit ) {
+			$suffix  = SCRIPT_DEBUG ? '' : '.min';
+			$baseurl = self::get_baseurl();
+
+			?>
+			var tinyMCEPreInit = {
+				baseURL: "<?php echo $baseurl; ?>",
+				suffix: "<?php echo $suffix; ?>",
+				mceInit: {},
+				qtInit: {},
+				load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
+			};
+			<?php
+		}
+		?>
+		</script>
+		<?php
 
 		if ( $user_can_richedit ) {
 			self::print_tinymce_scripts();
@@ -1564,7 +1560,7 @@ public static function print_tinymce_scripts() {
 
 		wp_print_scripts( array( 'wp-tinymce' ) );
 
-		wp_print_inline_script_tag( self::wp_mce_translation() );
+		echo "<script type='text/javascript'>\n" . self::wp_mce_translation() . "</script>\n";
 	}
 
 	/**
@@ -1619,29 +1615,26 @@ public static function editor_js() {
 		 * @param array $mce_settings TinyMCE settings array.
 		 */
 		do_action( 'before_wp_tiny_mce', self::$mce_settings );
-		wp_print_inline_script_tag(
-			static function () use ( $baseurl, $suffix, $mce_init, $qt_init, $ref ) {
-				?>
-				<script>
-				tinyMCEPreInit = {
-					baseURL: "<?php echo $baseurl; ?>",
-					suffix: "<?php echo $suffix; ?>",
-					<?php
-
-					if ( self::$drag_drop_upload ) {
-						echo 'dragDropUpload: true,';
-					}
+		?>
 
-					?>
-					mceInit: <?php echo $mce_init; ?>,
-					qtInit: <?php echo $qt_init; ?>,
-					ref: <?php echo self::_parse_init( $ref ); ?>,
-					load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
-				};
-				</script>
-				<?php
+		<script type="text/javascript">
+		tinyMCEPreInit = {
+			baseURL: "<?php echo $baseurl; ?>",
+			suffix: "<?php echo $suffix; ?>",
+			<?php
+
+			if ( self::$drag_drop_upload ) {
+				echo 'dragDropUpload: true,';
 			}
-		);
+
+			?>
+			mceInit: <?php echo $mce_init; ?>,
+			qtInit: <?php echo $qt_init; ?>,
+			ref: <?php echo self::_parse_init( $ref ); ?>,
+			load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
+		};
+		</script>
+		<?php
 
 		if ( $tmce_on ) {
 			self::print_tinymce_scripts();
@@ -1662,82 +1655,78 @@ static function () use ( $baseurl, $suffix, $mce_init, $qt_init, $ref ) {
 		 */
 		do_action( 'wp_tiny_mce_init', self::$mce_settings );
 
-		wp_print_inline_script_tag(
-			static function () {
-				?>
-				<script>
-				<?php
+		?>
+		<script type="text/javascript">
+		<?php
 
-				if ( self::$ext_plugins ) {
-					echo self::$ext_plugins . "\n";
-				}
+		if ( self::$ext_plugins ) {
+			echo self::$ext_plugins . "\n";
+		}
 
-				if ( ! is_admin() ) {
-					echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
-				}
+		if ( ! is_admin() ) {
+			echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
+		}
 
-				?>
+		?>
 
-				( function() {
-					var initialized = [];
-					var initialize  = function() {
-						var init, id, inPostbox, $wrap;
-						var readyState = document.readyState;
+		( function() {
+			var initialized = [];
+			var initialize  = function() {
+				var init, id, inPostbox, $wrap;
+				var readyState = document.readyState;
 
-						if ( readyState !== 'complete' && readyState !== 'interactive' ) {
-							return;
-						}
+				if ( readyState !== 'complete' && readyState !== 'interactive' ) {
+					return;
+				}
 
-						for ( id in tinyMCEPreInit.mceInit ) {
-							if ( initialized.indexOf( id ) > -1 ) {
-								continue;
-							}
+				for ( id in tinyMCEPreInit.mceInit ) {
+					if ( initialized.indexOf( id ) > -1 ) {
+						continue;
+					}
 
-							init      = tinyMCEPreInit.mceInit[id];
-							$wrap     = tinymce.$( '#wp-' + id + '-wrap' );
-							inPostbox = $wrap.parents( '.postbox' ).length > 0;
+					init      = tinyMCEPreInit.mceInit[id];
+					$wrap     = tinymce.$( '#wp-' + id + '-wrap' );
+					inPostbox = $wrap.parents( '.postbox' ).length > 0;
 
-							if (
-								! init.wp_skip_init &&
-								( $wrap.hasClass( 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( id ) ) &&
-								( readyState === 'complete' || ( ! inPostbox && readyState === 'interactive' ) )
-							) {
-								tinymce.init( init );
-								initialized.push( id );
+					if (
+						! init.wp_skip_init &&
+						( $wrap.hasClass( 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( id ) ) &&
+						( readyState === 'complete' || ( ! inPostbox && readyState === 'interactive' ) )
+					) {
+						tinymce.init( init );
+						initialized.push( id );
 
-								if ( ! window.wpActiveEditor ) {
-									window.wpActiveEditor = id;
-								}
-							}
+						if ( ! window.wpActiveEditor ) {
+							window.wpActiveEditor = id;
 						}
 					}
+				}
+			}
 
-					if ( typeof tinymce !== 'undefined' ) {
-						if ( tinymce.Env.ie && tinymce.Env.ie < 11 ) {
-							tinymce.$( '.wp-editor-wrap ' ).removeClass( 'tmce-active' ).addClass( 'html-active' );
-						} else {
-							if ( document.readyState === 'complete' ) {
-								initialize();
-							} else {
-								document.addEventListener( 'readystatechange', initialize );
-							}
-						}
+			if ( typeof tinymce !== 'undefined' ) {
+				if ( tinymce.Env.ie && tinymce.Env.ie < 11 ) {
+					tinymce.$( '.wp-editor-wrap ' ).removeClass( 'tmce-active' ).addClass( 'html-active' );
+				} else {
+					if ( document.readyState === 'complete' ) {
+						initialize();
+					} else {
+						document.addEventListener( 'readystatechange', initialize );
 					}
+				}
+			}
 
-					if ( typeof quicktags !== 'undefined' ) {
-						for ( id in tinyMCEPreInit.qtInit ) {
-							quicktags( tinyMCEPreInit.qtInit[id] );
+			if ( typeof quicktags !== 'undefined' ) {
+				for ( id in tinyMCEPreInit.qtInit ) {
+					quicktags( tinyMCEPreInit.qtInit[id] );
 
-							if ( ! window.wpActiveEditor ) {
-								window.wpActiveEditor = id;
-							}
-						}
+					if ( ! window.wpActiveEditor ) {
+						window.wpActiveEditor = id;
 					}
-				}());
-				</script>
-				<?php
+				}
 			}
-		);
+		}());
+		</script>
+		<?php
 
 		if ( in_array( 'wplink', self::$plugins, true ) || in_array( 'link', self::$qt_buttons, true ) ) {
 			self::wp_link_dialog();
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 70534ccb68bc2..86c17d556f216 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -7655,25 +7655,23 @@ function wp_post_preview_js() {
 	// Has to match the window name used in post_submit_meta_box().
 	$name = 'wp-preview-' . (int) $post->ID;
 
-	wp_print_inline_script_tag(
-		static function () use ( $name ) {
-			?>
-			<script>
-			( function() {
-				var query = document.location.search;
-
-				if ( query && query.indexOf( 'preview=true' ) !== -1 ) {
-					window.name = '<?php echo $name; ?>';
-				}
+	ob_start();
+	?>
+	<script>
+	( function() {
+		var query = document.location.search;
 
-				if ( window.addEventListener ) {
-					window.addEventListener( 'unload', function() { window.name = ''; }, false );
-				}
-			}());
-			</script>
-			<?php
+		if ( query && query.indexOf( 'preview=true' ) !== -1 ) {
+			window.name = '<?php echo $name; ?>';
 		}
-	);
+
+		if ( window.addEventListener ) {
+			window.addEventListener( 'unload', function() { window.name = ''; }, false );
+		}
+	}());
+	</script>
+	<?php
+	wp_print_inline_script_tag( str_replace( array( '<script>', '</script>' ), '', ob_get_clean() ) );
 }
 
 /**
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 249a41aae99c9..20c6e70cae7ca 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -2828,10 +2828,9 @@ function wp_print_script_tag( $attributes ) {
  * Automatically injects type attribute if needed.
  *
  * @since 5.7.0
- * @since 6.4.0 The $javascript argument can also be a Closure.
  *
- * @param string|Closure $javascript Inline JavaScript code, or a Closure prints a string starting with `<script>` and ending with `</script>`.
- * @param array          $attributes Optional. Key-value pairs representing `<script>` tag attributes.
+ * @param string $javascript Inline JavaScript code.
+ * @param array  $attributes Optional. Key-value pairs representing `<script>` tag attributes.
  * @return string String containing inline JavaScript code wrapped around `<script>` tag.
  */
 function wp_get_inline_script_tag( $javascript, $attributes = array() ) {
@@ -2844,25 +2843,6 @@ function wp_get_inline_script_tag( $javascript, $attributes = array() ) {
 		);
 	}
 
-	// Accommodate inline scripts in PHP files to retain IDE checks.
-	if ( $javascript instanceof Closure ) {
-		ob_start();
-		$javascript();
-		$javascript = trim( ob_get_clean() );
-
-		if ( '<script>' === strtolower( substr( $javascript, 0, 8 ) ) ) {
-			$javascript = substr( $javascript, 8 );
-		} else {
-			_doing_it_wrong( __FUNCTION__, __( 'Closure output expected to start with script start tag (without any attributes).' ), '6.4' );
-		}
-
-		if ( '</script>' === strtolower( substr( $javascript, strlen( $javascript ) - 9, 9 ) ) ) {
-			$javascript = substr( $javascript, 0, strlen( $javascript ) - 9 );
-		} else {
-			_doing_it_wrong( __FUNCTION__, __( 'Closure output expected to end with script end tag.' ), '6.4' );
-		}
-	}
-
 	// Ensure markup is XHTML compatible if not HTML5.
 	if ( ! $is_html5 ) {
 		$javascript = sprintf( "/* <![CDATA[ */\n%s\n/* ]]> */", $javascript );
@@ -2892,10 +2872,9 @@ function wp_get_inline_script_tag( $javascript, $attributes = array() ) {
  * Automatically injects type attribute if needed.
  *
  * @since 5.7.0
- * @since 6.4.0 The $javascript argument can also be a Closure.
  *
- * @param string|Closure $javascript Inline JavaScript code, or a Closure prints a string starting with `<script>` and ending with `</script>`.
- * @param array          $attributes Optional. Key-value pairs representing `<script>` tag attributes.
+ * @param string $javascript Inline JavaScript code.
+ * @param array  $attributes Optional. Key-value pairs representing `<script>` tag attributes.
  */
 function wp_print_inline_script_tag( $javascript, $attributes = array() ) {
 	echo wp_get_inline_script_tag( $javascript, $attributes );
diff --git a/src/wp-includes/theme-templates.php b/src/wp-includes/theme-templates.php
index a3dec6c0d3a15..942e6fe50037c 100644
--- a/src/wp-includes/theme-templates.php
+++ b/src/wp-includes/theme-templates.php
@@ -160,52 +160,50 @@ function the_block_template_skip_link() {
 	/**
 	 * Print the skip-link script.
 	 */
-	wp_print_inline_script_tag(
-		static function () {
-			?>
-			<script>
-			( function() {
-				var skipLinkTarget = document.querySelector( 'main' ),
-					sibling,
-					skipLinkTargetID,
-					skipLink;
-
-				// Early exit if a skip-link target can't be located.
-				if ( ! skipLinkTarget ) {
-					return;
-				}
-
-				/*
-				 * Get the site wrapper.
-				 * The skip-link will be injected in the beginning of it.
-				 */
-				sibling = document.querySelector( '.wp-site-blocks' );
-
-				// Early exit if the root element was not found.
-				if ( ! sibling ) {
-					return;
-				}
-
-				// Get the skip-link target's ID, and generate one if it doesn't exist.
-				skipLinkTargetID = skipLinkTarget.id;
-				if ( ! skipLinkTargetID ) {
-					skipLinkTargetID = 'wp--skip-link--target';
-					skipLinkTarget.id = skipLinkTargetID;
-				}
-
-				// Create the skip link.
-				skipLink = document.createElement( 'a' );
-				skipLink.classList.add( 'skip-link', 'screen-reader-text' );
-				skipLink.href = '#' + skipLinkTargetID;
-				skipLink.innerHTML = '<?php /* translators: Hidden accessibility text. */ esc_html_e( 'Skip to content' ); ?>';
-
-				// Inject the skip link.
-				sibling.parentElement.insertBefore( skipLink, sibling );
-			}() );
-			</script>
-			<?php
+	ob_start();
+	?>
+	<script>
+	( function() {
+		var skipLinkTarget = document.querySelector( 'main' ),
+			sibling,
+			skipLinkTargetID,
+			skipLink;
+
+		// Early exit if a skip-link target can't be located.
+		if ( ! skipLinkTarget ) {
+			return;
 		}
-	);
+
+		/*
+		 * Get the site wrapper.
+		 * The skip-link will be injected in the beginning of it.
+		 */
+		sibling = document.querySelector( '.wp-site-blocks' );
+
+		// Early exit if the root element was not found.
+		if ( ! sibling ) {
+			return;
+		}
+
+		// Get the skip-link target's ID, and generate one if it doesn't exist.
+		skipLinkTargetID = skipLinkTarget.id;
+		if ( ! skipLinkTargetID ) {
+			skipLinkTargetID = 'wp--skip-link--target';
+			skipLinkTarget.id = skipLinkTargetID;
+		}
+
+		// Create the skip link.
+		skipLink = document.createElement( 'a' );
+		skipLink.classList.add( 'skip-link', 'screen-reader-text' );
+		skipLink.href = '#' + skipLinkTargetID;
+		skipLink.innerHTML = '<?php /* translators: Hidden accessibility text. */ esc_html_e( 'Skip to content' ); ?>';
+
+		// Inject the skip link.
+		sibling.parentElement.insertBefore( skipLink, sibling );
+	}() );
+	</script>
+	<?php
+	wp_print_inline_script_tag( str_replace( array( '<script>', '</script>' ), '', ob_get_clean() ) );
 }
 
 /**
diff --git a/src/wp-includes/theme.php b/src/wp-includes/theme.php
index a43d30d3e10e2..79b5e62b54211 100644
--- a/src/wp-includes/theme.php
+++ b/src/wp-includes/theme.php
@@ -3742,27 +3742,25 @@ function wp_customize_support_script() {
 	$admin_origin = parse_url( admin_url() );
 	$home_origin  = parse_url( home_url() );
 	$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
-	wp_print_inline_script_tag(
-		static function () use ( $cross_domain ) {
-			?>
-			<script>
-			(function() {
-				var request, b = document.body, c = 'className', cs = 'customize-support', rcs = new RegExp('(^|\\s+)(no-)?'+cs+'(\\s+|$)');
-
-				<?php if ( $cross_domain ) : ?>
-					request = (function(){ var xhr = new XMLHttpRequest(); return ('withCredentials' in xhr); })();
-				<?php else : ?>
-					request = true;
-				<?php endif; ?>
-
-				b[c] = b[c].replace( rcs, ' ' );
-				// The customizer requires postMessage and CORS (if the site is cross domain).
-				b[c] += ( window.postMessage && request ? ' ' : ' no-' ) + cs;
-			}());
-			</script>
-			<?php
-		}
-	);
+	ob_start();
+	?>
+	<script>
+		(function() {
+			var request, b = document.body, c = 'className', cs = 'customize-support', rcs = new RegExp('(^|\\s+)(no-)?'+cs+'(\\s+|$)');
+
+	<?php	if ( $cross_domain ) : ?>
+			request = (function(){ var xhr = new XMLHttpRequest(); return ('withCredentials' in xhr); })();
+	<?php	else : ?>
+			request = true;
+	<?php	endif; ?>
+
+			b[c] = b[c].replace( rcs, ' ' );
+			// The customizer requires postMessage and CORS (if the site is cross domain).
+			b[c] += ( window.postMessage && request ? ' ' : ' no-' ) + cs;
+		}());
+	</script>
+	<?php
+	wp_print_inline_script_tag( str_replace( array( '<script>', '</script>' ), '', ob_get_clean() ) );
 }
 
 /**
diff --git a/src/wp-includes/widgets/class-wp-widget-archives.php b/src/wp-includes/widgets/class-wp-widget-archives.php
index f32aa9bbb0254..21d3a7b67293a 100644
--- a/src/wp-includes/widgets/class-wp-widget-archives.php
+++ b/src/wp-includes/widgets/class-wp-widget-archives.php
@@ -100,8 +100,6 @@ public function widget( $args, $instance ) {
 					$label = __( 'Select Post' );
 					break;
 			}
-
-			$type_attr = current_theme_supports( 'html5', 'script' ) ? '' : ' type="text/javascript"';
 			?>
 
 			<option value=""><?php echo esc_html( $label ); ?></option>
@@ -109,8 +107,8 @@ public function widget( $args, $instance ) {
 
 		</select>
 
-<script<?php echo $type_attr; ?>>
-/* <![CDATA[ */
+			<?php ob_start(); ?>
+<script>
 (function() {
 	var dropdown = document.getElementById( "<?php echo esc_js( $dropdown_id ); ?>" );
 	function onSelectChange() {
@@ -120,9 +118,9 @@ function onSelectChange() {
 	}
 	dropdown.onchange = onSelectChange;
 })();
-/* ]]> */
 </script>
 			<?php
+			wp_print_inline_script_tag( str_replace( array( '<script>', '</script>' ), '', ob_get_clean() ) );
 		} else {
 			$format = current_theme_supports( 'html5', 'navigation-widgets' ) ? 'html5' : 'xhtml';
 
diff --git a/src/wp-includes/widgets/class-wp-widget-categories.php b/src/wp-includes/widgets/class-wp-widget-categories.php
index 3c009709ba9f5..e00ce7f9605a3 100644
--- a/src/wp-includes/widgets/class-wp-widget-categories.php
+++ b/src/wp-includes/widgets/class-wp-widget-categories.php
@@ -92,11 +92,10 @@ public function widget( $args, $instance ) {
 
 			echo '</form>';
 
-			$type_attr = current_theme_supports( 'html5', 'script' ) ? '' : ' type="text/javascript"';
+			ob_start();
 			?>
 
-<script<?php echo $type_attr; ?>>
-/* <![CDATA[ */
+<script>
 (function() {
 	var dropdown = document.getElementById( "<?php echo esc_js( $dropdown_id ); ?>" );
 	function onCatChange() {
@@ -106,10 +105,10 @@ function onCatChange() {
 	}
 	dropdown.onchange = onCatChange;
 })();
-/* ]]> */
 </script>
 
 			<?php
+			wp_print_inline_script_tag( str_replace( array( '<script>', '</script>' ), '', ob_get_clean() ) );
 		} else {
 			$format = current_theme_supports( 'html5', 'navigation-widgets' ) ? 'html5' : 'xhtml';