diff --git a/core/modules/link/templates/link-formatter-link-separate.html.twig b/core/modules/link/templates/link-formatter-link-separate.html.twig
index d0378e0..469cd9a 100644
--- a/core/modules/link/templates/link-formatter-link-separate.html.twig
+++ b/core/modules/link/templates/link-formatter-link-separate.html.twig
@@ -15,8 +15,6 @@
  */
 #}
 {% spaceless %}
-  {% if title %}
-    {{ title }}
-  {% endif %}
+  {{ title }}
   {{ link }}
 {% endspaceless %}
diff --git a/core/modules/system/templates/block--system-branding-block.html.twig b/core/modules/system/templates/block--system-branding-block.html.twig
index 9717abc..63e0c3e 100644
--- a/core/modules/system/templates/block--system-branding-block.html.twig
+++ b/core/modules/system/templates/block--system-branding-block.html.twig
@@ -24,7 +24,5 @@
   {% if site_name %}
     <a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
   {% endif %}
-  {% if site_slogan %}
-    {{ site_slogan }}
-  {% endif %}
+  {{ site_slogan }}
 {% endblock %}
diff --git a/core/modules/system/templates/datetime-wrapper.html.twig b/core/modules/system/templates/datetime-wrapper.html.twig
index 772c96e..d5418df 100644
--- a/core/modules/system/templates/datetime-wrapper.html.twig
+++ b/core/modules/system/templates/datetime-wrapper.html.twig
@@ -24,6 +24,4 @@
   <h4{{ title_attributes.addClass(title_classes) }}>{{ title }}</h4>
 {% endif %}
 {{ content }}
-{% if description %}
-  {{ description }}
-{% endif %}
+{{ description }}
diff --git a/core/modules/system/templates/details.html.twig b/core/modules/system/templates/details.html.twig
index 9e31665..410f4e4 100644
--- a/core/modules/system/templates/details.html.twig
+++ b/core/modules/system/templates/details.html.twig
@@ -20,15 +20,9 @@
     <summary{{ summary_attributes }}>{{ title }}</summary>
   {%- endif -%}
 
-  {%- if description -%}
-    {{ description }}
-  {%- endif -%}
+  {{ description }}
 
-  {%- if children -%}
-    {{ children }}
-  {%- endif -%}
+  {{ children }}
 
-  {%- if value -%}
-    {{ value }}
-  {%- endif -%}
+  {{ value }}
 </details>
diff --git a/core/modules/system/templates/maintenance-page.html.twig b/core/modules/system/templates/maintenance-page.html.twig
index ca9e084..748ed5a 100644
--- a/core/modules/system/templates/maintenance-page.html.twig
+++ b/core/modules/system/templates/maintenance-page.html.twig
@@ -31,14 +31,12 @@
   {% endif %}
 </header>
 
-{{ page.highlighted }}
-
 <main role="main">
   {% if title %}
     <h1>{{ title }}</h1>
   {% endif %}
 
-  {{ page.messages }}
+  {{ page.highlighted }}
 
   {{ page.content }}
 </main>