diff --git a/core/includes/form.inc b/core/includes/form.inc
index 6303095..d703431 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -141,7 +141,7 @@ function form_state_values_clean(FormStateInterface $form_state) {
     // the value corresponding to this button.
     // We iterate over the #parents of this button and move a reference to
     // each parent in $form_state->getValues(). For example, if #parents is:
-    //   array('foo', 'bar', 'baz')
+    // array('foo', 'bar', 'baz')
     // then the corresponding $form_state->getValues() part will look like this:
     // array(
     //   'foo' => array(
@@ -242,8 +242,8 @@ function form_select_options($element, $choices = NULL) {
     }
     $choices = $element['#options'];
   }
-  // array_key_exists() accommodates the rare event where $element['#value'] is NULL.
-  // isset() fails in this situation.
+  // array_key_exists() accommodates the rare event where $element['#value'] is
+  // NULL. isset() fails in this situation.
   $value_valid = isset($element['#value']) || array_key_exists('#value', $element);
   $value_is_array = $value_valid && is_array($element['#value']);
   // Check if the element is multiple select and no value has been selected.
@@ -267,7 +267,9 @@ function form_select_options($element, $choices = NULL) {
       else {
         $selected = '';
       }
-      $options .= '<option value="' . String::checkPlain($key) . '"' . $selected . '>' . String::checkPlain($choice) . '</option>';
+      $options .= '<option value="' . String::checkPlain($key) . '"' . $selected . '>' .
+        String::checkPlain($choice) .
+        '</option>';
     }
   }
   return SafeMarkup::set($options);
@@ -460,7 +462,6 @@ function template_preprocess_checkboxes(&$variables) {
  *   An associative array containing:
  *   - element: An associative array containing the properties and children of
  *     the details element. Properties used: #children.
- *
  */
 function template_preprocess_vertical_tabs(&$variables) {
   $element = $variables['element'];
@@ -647,7 +648,12 @@ function template_preprocess_form_element(&$variables) {
   // Add label_display and label variables to template.
   $variables['label_display'] = $element['#title_display'];
   $variables['label'] = array('#theme' => 'form_element_label');
-  $variables['label'] += array_intersect_key($element, array_flip(array('#id', '#required', '#title', '#title_display')));
+  $variables['label'] += array_intersect_key($element, array_flip(array(
+    '#id',
+    '#required',
+    '#title',
+    '#title_display',
+  )));
 
   $variables['children'] = $element['#children'];
 }
@@ -952,7 +958,7 @@ function batch_process($redirect = NULL, $url = 'batch', $redirect_callback = NU
   $batch =& batch_get();
 
   if (isset($batch)) {
-    // Add process information
+    // Add process information.
     $process_info = array(
       'current_set' => 0,
       'progressive' => TRUE,
@@ -984,7 +990,18 @@ function batch_process($redirect = NULL, $url = 'batch', $redirect_callback = NU
     if ($batch['progressive']) {
       // Now that we have a batch id, we can generate the redirection link in
       // the generic error message.
-      $batch['error_message'] = t('Please continue to <a href="@error_url">the error page</a>', array('@error_url' => url($url, array('query' => array('id' => $batch['id'], 'op' => 'finished')))));
+      $batch['error_message'] = t('Please continue to <a href="@error_url">the error page</a>',
+        array(
+          '@error_url' => url(
+            $url,
+            array('query' =>
+              array(
+                'id' => $batch['id'],
+                'op' => 'finished',
+              ),
+            )
+          ),
+        ));
 
       // Clear the way for the redirection to the batch processing page, by
       // saving and unsetting the 'destination', if there is any.
@@ -1002,7 +1019,8 @@ function batch_process($redirect = NULL, $url = 'batch', $redirect_callback = NU
       // Store the batch.
       \Drupal::service('batch.storage')->create($batch);
 
-      // Set the batch number in the session to guarantee that it will stay alive.
+      // Set the batch number in the session to guarantee that it will stay
+      // alive.
       $_SESSION['batches'][$batch['id']] = TRUE;
 
       // Redirect for processing.