diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 9b04cf3..9f46bb4 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -505,8 +505,8 @@ function drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE)
  */
 function drupal_get_messages($type = NULL, $clear_queue = TRUE) {
   /** @var \Drupal\Core\Messenger\MessengerInterface $messenger */
-  if ((($messenger = \Drupal::hasService('messenger')) ? \Drupal::service('messenger') : NULL)
-    && $messages = $messenger->all()) {
+  $messenger = \Drupal::hasService('messenger') ? \Drupal::service('messenger') : NULL;
+  if ($messenger && ($messages = $messenger->all())) {
     if ($type) {
       if ($clear_queue) {
         $messenger->deleteByType($type);
diff --git a/core/lib/Drupal/Core/Messenger/LegacyMessenger.php b/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
index 69c2292..ea09dfd 100644
--- a/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
+++ b/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
@@ -148,4 +148,3 @@ private function getMessages($type = NULL, $clear_queue = TRUE) {
   }
 
 }
-