diff --git a/core/lib/Drupal/Core/Controller/ControllerResolver.php b/core/lib/Drupal/Core/Controller/ControllerResolver.php
index f773b78..5f94dc1 100644
--- a/core/lib/Drupal/Core/Controller/ControllerResolver.php
+++ b/core/lib/Drupal/Core/Controller/ControllerResolver.php
@@ -66,7 +66,7 @@ public function getControllerFromAttribute($controller, $path = '') {
       return $controller;
     }
 
-    if (false === strpos($controller, ':')) {
+    if (strpos($controller, ':') === FALSE) {
       if (method_exists($controller, '__invoke')) {
         return new $controller;
       }
diff --git a/core/lib/Drupal/Core/Controller/HtmlPageController.php b/core/lib/Drupal/Core/Controller/HtmlPageController.php
index 8960755..cc484d1 100644
--- a/core/lib/Drupal/Core/Controller/HtmlPageController.php
+++ b/core/lib/Drupal/Core/Controller/HtmlPageController.php
@@ -63,11 +63,10 @@ public function content(Request $request, $_content) {
     if (!is_array($page_content)) {
       $page_content = array(
         '#markup' => $page_content,
-        '#title' => '',
       );
     }
     // If no title was specified, allow to override it via the request.
-    if ((!isset($page_content['#title']) || $page_content['#title'] === '') && $request->attributes->has('_title')) {
+    if (!isset($page_content['#title']) && $request->attributes->has('_title')) {
       $page_content['#title'] = $request->attributes->get('_title');
     }