diff --git a/core/modules/system/templates/table.html.twig b/core/modules/system/templates/table.html.twig
index e437632..2d9235e 100644
--- a/core/modules/system/templates/table.html.twig
+++ b/core/modules/system/templates/table.html.twig
@@ -58,7 +58,12 @@
     <thead>
       <tr>
         {% for cell in header %}
-          <{{ cell.tag }}{% if cell.table_sort %}{{ cell.attributes.addClass('active') }}{% else %}{{ cell.attributes }}{% endif %}>
+          {%
+            set cell_classes = [
+              cell.table_sort ? 'active',
+            ]
+          %}
+          <{{ cell.tag }}{{ cell.attributes.addclass(cell_classes) }}>
             {{- cell.content -}}
           </{{ cell.tag }}>
         {% endfor %}
@@ -69,12 +74,20 @@
   {% if rows %}
     <tbody>
       {% for row in rows %}
-        {% if not no_striping %}
-          {% set striping_class = cycle(['odd', 'even'], loop.index0) %}
-        {% endif %}
-        <tr{% if striping_class %}{{ row.attributes.addClass(striping_class) }}{% else %}{{ row.attributes }}{% endif %}>
+        {%
+          set row_classes = [
+            not no_striping ? cycle(['odd', 'even'], loop.index0),
+          ]
+        %}
+        <tr{{ row.attributes.addClass(row_classes) }}>
           {% for cell in row.cells %}
-            <{{ cell.tag }}{% if empty %}{{ cell.attributes.addClass('empty', 'message') }}{% else %}{{ cell.attributes }}{% endif %}>
+            {%
+              set cell_classes = [
+                empty ? 'empty',
+                empty ? 'message',
+              ]
+            %}
+            <{{ cell.tag }}{{ cell.attributes.addClass(cell_classes) }}>
               {{- cell.content -}}
             </{{ cell.tag }}>
           {% endfor %}