diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 4566a5e..cc542ca 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Functions that need to be loaded on every Drupal request.
+ */
+
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Database\Database;
 use Symfony\Component\ClassLoader\UniversalClassLoader;
@@ -14,11 +19,6 @@
 use Drupal\Core\Lock\LockBackendInterface;
 
 /**
- * @file
- * Functions that need to be loaded on every Drupal request.
- */
-
-/**
  * The current system version.
  */
 const VERSION = '8.0-dev';
@@ -223,7 +223,7 @@
 const LANGUAGE_MULTIPLE = 'mul';
 
 /**
- * Language code referring to the default language of data, e.g. of an entity.
+ * Language code referring to the default language of data, e.g., of an entity.
  *
  * @todo: Change value to differ from LANGUAGE_NOT_SPECIFIED once field API
  * leverages the property API.
@@ -411,13 +411,13 @@ function timer_stop($name) {
  * directory.
  *
  * @param bool $require_settings
- *   Only configuration directories with an existing settings.php file
- *   will be recognized. Defaults to TRUE. During initial installation,
- *   this is set to FALSE so that Drupal can detect a matching directory,
- *   then create a new settings.php file in it.
+ *   (optional) Only configuration directories with an existing settings.php
+ *   file will be recognized. Defaults to TRUE. During initial installation,
+ *   this is set to FALSE so that Drupal can detect a matching directory, then
+ *   create a new settings.php file in it.
  * @param bool $reset
- *   Force a full search for matching directories even if one had been
- *   found previously. Defaults to FALSE.
+ *   (optional) Force a full search for matching directories even if one had
+ *   been found previously. Defaults to FALSE.
  *
  * @return
  *   The path of the matching directory.
@@ -465,12 +465,12 @@ function conf_path($require_settings = TRUE, $reset = FALSE) {
  * @endcode
  *
  * @param string $http_host
- *   The hostname and optional port number, e.g. "www.example.com" or
+ *   The hostname and optional port number, e.g., "www.example.com" or
  *   "www.example.com:8080".
  * @param string $script_name
  *   The part of the URL following the hostname, including the leading slash.
  * @param bool $require_settings
- *   (optional) Boolean indicating whether to recognize only configuration
+ *   (optional) A Boolean indicating whether to recognize only configuration
  *   directories with an existing settings.php file. Defaults to TRUE.
  *
  * @return string
@@ -968,7 +968,7 @@ function drupal_get_filename($type, $name, $filename = NULL) {
  *   released. Defaults to an empty array.
  *
  * @return array
- *   An associative array of variable keys and  values.
+ *   An associative array of variable keys and values.
  */
 function variable_initialize($conf = array()) {
   // NOTE: caching the variables improves performance by 20% when serving
@@ -1178,16 +1178,17 @@ function drupal_load($type, $name) {
  * Sets an HTTP response header for the current page.
  *
  * Note: When sending a Content-Type header, always include a 'charset' type,
- * too. This is necessary to avoid security bugs (e.g. UTF-7 XSS).
+ * too. This is necessary to avoid security bugs (e.g., UTF-7 XSS).
  *
  * @param $name
  *   The HTTP header name, or the special 'Status' header name.
  * @param $value
  *   The HTTP header value; if equal to FALSE, the specified header is unset.
  *   If $name is 'Status', this is expected to be a status code followed by a
- *   reason phrase, e.g. "404 Not Found".
+ *   reason phrase, e.g., "404 Not Found".
  * @param $append
- *   Whether to append the value to an existing header or to replace it.
+ *   (optional) Whether to append the value to an existing header or to replace
+ *   it. Defaults to FALSE.
  */
 function drupal_add_http_header($name, $value, $append = FALSE) {
   // The headers as name/value pairs.
@@ -2708,7 +2709,7 @@ function drupal_language_initialize() {
  * @see Drupal\Core\Language\LanguageManager
  *
  * @param string $type
- *   The type of language object needed, e.g. LANGUAGE_TYPE_INTERFACE.
+ *   The type of language object needed, e.g., LANGUAGE_TYPE_INTERFACE.
  * @param bool $reset
  *   TRUE to reset the statically cached language object for the type, or for
  *   all types if $type is NULL.
@@ -3036,7 +3037,7 @@ function _current_path($path = NULL) {
  * read. In menu callback functions, attempt to use named arguments. See the
  * explanation in menu.inc for how to construct callbacks that take arguments.
  * When attempting to use this function to load an element from the current
- * path, e.g. loading the node on a node page, use menu_get_object() instead.
+ * path, e.g., loading the node on a node page, use menu_get_object() instead.
  *
  * @param $index
  *   The index of the component, where each component is separated by a '/'
@@ -3307,7 +3308,7 @@ function drupal_classloader_register($name, $path) {
  *
  * @param $name
  *   Globally unique name for the variable. For a function with only one static,
- *   variable, the function name (e.g. via the PHP magic __FUNCTION__ constant)
+ *   variable, the function name (e.g., via the PHP magic __FUNCTION__ constant)
  *   is recommended. For a function with multiple static variables add a
  *   distinguishing suffix to the function name for each one.
  * @param $default_value
@@ -3454,11 +3455,11 @@ function _drupal_shutdown_function() {
  *
  * @param $required
  *   The memory required for the operation, expressed as a number of bytes with
- *   optional SI or IEC binary unit prefix (e.g. 2, 3K, 5MB, 10G, 6GiB, 8bytes,
+ *   optional SI or IEC binary unit prefix (e.g., 2, 3K, 5MB, 10G, 6GiB, 8bytes,
  *   9mbytes).
  * @param $memory_limit
  *   (optional) The memory limit for the operation, expressed as a number of
- *   bytes with optional SI or IEC binary unit prefix (e.g. 2, 3K, 5MB, 10G,
+ *   bytes with optional SI or IEC binary unit prefix (e.g., 2, 3K, 5MB, 10G,
  *   6GiB, 8bytes, 9mbytes). If no value is passed, the current PHP
  *   memory_limit will be used. Defaults to NULL.
  *
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 339fc83..498b685 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -1,13 +1,5 @@
 <?php
 
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Database\Database;
-use Drupal\Core\Template\Attribute;
-
 /**
  * @file
  * Common functions that many Drupal modules will need to reference.
@@ -16,6 +8,14 @@
  * a cached page are instead located in bootstrap.inc.
  */
 
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Template\Attribute;
+
 /**
  * @defgroup php_wrappers PHP wrapper functions
  * @{
@@ -476,7 +476,7 @@ function drupal_get_query_array($query) {
  * urlencode()) all query parameters.
  *
  * @param $query
- *   The query parameter array to be processed, e.g. $_GET.
+ *   The query parameter array to be processed, e.g., $_GET.
  * @param $parent
  *   Internal use only. Used to build the $query array key for nested items.
  *
@@ -732,7 +732,7 @@ function drupal_goto($path = '', array $options = array(), $http_response_code =
  *   - request: A string containing the request body that was sent.
  *   - code: An integer containing the response status code, or the error code
  *     if an error occurred.
- *   - protocol: The response protocol (e.g. HTTP/1.1 or HTTP/1.0).
+ *   - protocol: The response protocol (e.g., HTTP/1.1 or HTTP/1.0).
  *   - status_message: The status message from the response, if a response was
  *     received.
  *   - redirect_code: If redirected, an integer containing the initial response
@@ -1249,7 +1249,7 @@ function flood_is_allowed($name, $threshold, $window = 3600, $identifier = NULL)
  */
 
 /**
- * Strips dangerous protocols (e.g. 'javascript:') from a URI.
+ * Strips dangerous protocols (e.g., 'javascript:') from a URI.
  *
  * This function must be called for all URIs within user-entered input prior
  * to being output to an HTML attribute value. It is often called as part of
@@ -1751,7 +1751,7 @@ function format_xml_elements($array) {
  *   The item count to display.
  * @param $singular
  *   The string for the singular case. Make sure it is clear this is singular,
- *   to ease translation (e.g. use "1 new comment" instead of "1 new"). Do not
+ *   to ease translation (e.g., use "1 new comment" instead of "1 new"). Do not
  *   use @count in the singular string.
  * @param $plural
  *   The string for the plural case. Make sure it is clear this is plural, to
@@ -1811,7 +1811,7 @@ function format_plural($count, $singular, $plural, array $args = array(), array
  *
  * @param $size
  *   A size expressed as a number of bytes with optional SI or IEC binary unit
- *   prefix (e.g. 2, 3K, 5MB, 10G, 6GiB, 8 bytes, 9mbytes).
+ *   prefix (e.g., 2, 3K, 5MB, 10G, 6GiB, 8 bytes, 9mbytes).
  *
  * @return
  *   An integer representation of the size in bytes.
@@ -2057,13 +2057,13 @@ function date_iso8601($date) {
  *
  * Callback for preg_replace_callback() within format_date().
  *
- * @param array $matches
- *   The matches found for the regular expression passed to
+ * @param array|null $matches
+ *   (optional) The matches found for the regular expression passed to
  *   preg_replace_callback() with this callback. See preg_match() for more
- *   information.
+ *   information. Defaults to NULL.
  * @param string|null $new_langcode
  *   (optional) The language code to used for translation. Cached statically.
- *   This parameter is ignored if $matches is passed.
+ *   This parameter is ignored if $matches is passed. Defaults to NULL.
  *
  * @param string
  *   A translation of a formatted date string.
@@ -2114,7 +2114,7 @@ function _format_date_callback(array $matches = NULL, $new_langcode = NULL) {
  *   "node/34" or "http://example.com/foo". The default value is equivalent to
  *   passing in '<front>'. A few notes:
  *   - If you provide a full URL, it will be considered an external URL.
- *   - If you provide only the path (e.g. "node/34"), it will be
+ *   - If you provide only the path (e.g., "node/34"), it will be
  *     considered an internal link. In this case, it should be a system URL,
  *     and it will be replaced with the alias, if one exists. Additional query
  *     arguments for internal paths must be supplied in $options['query'], not
@@ -2123,7 +2123,7 @@ function _format_date_callback(array $matches = NULL, $new_langcode = NULL) {
  *     path is assumed already to be the correct path alias, and the alias is
  *     not looked up.
  *   - The special string '<front>' generates a link to the site's base URL.
- *   - If your external URL contains a query (e.g. http://example.com/foo?a=b),
+ *   - If your external URL contains a query (e.g., http://example.com/foo?a=b),
  *     then you can either URL encode the query keys and values yourself and
  *     include them in $path, or use $options['query'] to let this function
  *     URL encode them.
@@ -2259,7 +2259,7 @@ function url($path = NULL, array $options = array()) {
 }
 
 /**
- * Returns TRUE if a path is external to Drupal (e.g. http://example.com).
+ * Returns TRUE if a path is external to Drupal (e.g., http://example.com).
  *
  * If a path cannot be assessed by Drupal's menu handler, then we must
  * treat it as potentially insecure.
@@ -3314,7 +3314,7 @@ function drupal_build_css_cache($css) {
  *   information.
  * @param string|null $base
  *   (optional) The base path for the CSS files. Cached statically. This
- *   parameter is not used if $matches is passed.
+ *   parameter is not used if $matches is passed. Defaults to NULL.
  *
  * @return string
  *   A prefixed path as a string.
@@ -4721,17 +4721,19 @@ function drupal_get_library($module, $name = NULL) {
  *   A class name applied on all related form elements for this action.
  * @param $subgroup
  *   (optional) If the group has several subgroups within it, this string should
- *   contain the class name identifying fields in the same subgroup.
+ *   contain the class name identifying fields in the same subgroup. Defaults to
+ *   NULL.
  * @param $source
  *   (optional) If the $action is 'match', this string should contain the class
  *   name identifying what field will be used as the source value when matching
- *   the value in $subgroup.
+ *   the value in $subgroup. Defaults to NULL.
  * @param $hidden
  *   (optional) The column containing the field elements may be entirely hidden
  *   from view dynamically when the JavaScript is loaded. Set to FALSE if the
- *   column should not be hidden.
+ *   column should not be hidden. Defaults to TRUE.
  * @param $limit
- *   (optional) Limit the maximum amount of parenting in this table.
+ *   (optional) Limit the maximum amount of parenting in this table. Defaults to
+ *   zero.
  *
  * @see block-admin-display-form.tpl.php
  * @see theme_menu_overview_form()
@@ -5075,8 +5077,8 @@ function drupal_page_set_cache($body) {
  *
  * Do not call this function from a test. Use $this->cronRun() instead.
  *
- * @return
- *   TRUE if cron ran successfully.
+ * @return bool
+ *   TRUE if cron ran successfully, FALSE if a lock could not be acquired.
  */
 function drupal_cron_run() {
   // Allow execution to continue even if the request gets canceled.
@@ -5648,7 +5650,7 @@ function drupal_render_page($page) {
  * #theme is the theme function called first. If it is set and the element has
  * any children, it is the responsibility of the theme function to render
  * these children. For elements that are not allowed to have any children,
- * e.g. buttons or textfields, the theme function can be used to render the
+ * e.g., buttons or textfields, the theme function can be used to render the
  * element itself. If #theme is not present and the element has children, each
  * child is itself rendered by a call to drupal_render(), and the results are
  * concatenated.
@@ -6807,10 +6809,10 @@ function watchdog_severity_levels() {
  *
  * @param string $tags.
  *   A comma-separated string of values (tags, etc.), with any value
- *   containing a comma wrapped in double quotes (e.g. "Madison, WI").
+ *   containing a comma wrapped in double quotes (e.g., "Madison, WI").
  *
  * @return array
- *   An emty array or an array of strings.
+ *   An empty array or an array of strings.
  *
  * @see drupal_implode_tags()
  */
@@ -7016,7 +7018,7 @@ function debug($data, $label = NULL, $print_r = FALSE) {
  *
  * @return
  *   An associative array with three keys:
- *   - 'name' includes the name of the thing to depend on (e.g. 'foo').
+ *   - 'name' includes the name of the thing to depend on (e.g., 'foo').
  *   - 'original_version' contains the original version string (which can be
  *     used in the UI for reporting incompatibilities).
  *   - 'versions' is a list of associative arrays, each containing the keys