diff --git a/core/modules/comment/templates/field--comment.html.twig b/core/modules/comment/templates/field--comment.html.twig
index 537ca23..b074e45 100644
--- a/core/modules/comment/templates/field--comment.html.twig
+++ b/core/modules/comment/templates/field--comment.html.twig
@@ -22,7 +22,6 @@
  * @see comment_preprocess_field()
  */
 #}
-
 {%
   set classes = [
     'field',
@@ -33,7 +32,6 @@
     'comment-wrapper'
   ]
 %}
-
 <section{{ attributes.addClass(classes) }}>
   {% if comments and not label_hidden %}
     {{ title_prefix }}
diff --git a/core/modules/node/templates/field--node--title.html.twig b/core/modules/node/templates/field--node--title.html.twig
index 4bfc166..dc8cbbd 100644
--- a/core/modules/node/templates/field--node--title.html.twig
+++ b/core/modules/node/templates/field--node--title.html.twig
@@ -15,7 +15,6 @@
  * @ingroup themeable
  */
 #}
-
 {%
   set classes = [
     'field',
@@ -25,5 +24,4 @@
     'field-label-' ~ label_display
   ]
 %}
-
 <span{{ attributes.addClass(classes) }}>{{ items }}</span>
diff --git a/core/modules/system/templates/field.html.twig b/core/modules/system/templates/field.html.twig
index fdf45c4..229e64e 100644
--- a/core/modules/system/templates/field.html.twig
+++ b/core/modules/system/templates/field.html.twig
@@ -33,7 +33,6 @@
  * @ingroup themeable
  */
 #}
-
 {%
   set classes = [
     'field',
@@ -43,14 +42,13 @@
     'field-label-' ~ label_display
   ]
 %}
-
 <div{{ attributes.addClass(classes) }}>
   {% if not label_hidden %}
     <div{{ title_attributes.addClass('field-label') }}>{{ label }}:&nbsp;</div>
   {% endif %}
   <div{{ content_attributes.addClass('field-items') }}>
     {% for delta, item in items %}
-      <div class="field-item"{{ item_attributes[delta] }}>{{ item }}</div>
+      <div{{ item_attributes[delta].addClass('field-item') }}>{{ item }}</div>
     {% endfor %}
   </div>
 </div>
diff --git a/core/themes/bartik/templates/field--taxonomy-term-reference.html.twig b/core/themes/bartik/templates/field--taxonomy-term-reference.html.twig
index 2307cf9..a28f175 100644
--- a/core/themes/bartik/templates/field--taxonomy-term-reference.html.twig
+++ b/core/themes/bartik/templates/field--taxonomy-term-reference.html.twig
@@ -26,14 +26,13 @@
     'clearfix'
   ]
 %}
-
 <div{{ attributes.addClass(classes) }}>
   {% if not label_hidden %}
     <h3{{ title_attributes }}>{{ label }}: </h3>
   {% endif %}
-  <ul class="links field-items {{ content_attributes.class }}"{{ content_attributes|without('class') }}>
+  <ul{{ content_attributes.addClass('links', 'field-items') }}>
     {% for delta, item in items %}
-      <li class="taxonomy-term-reference-{{ delta }}"{{ item_attributes[delta] }}>{{ item }}</li>
+      <li{{ item_attributes[delta].addClass('taxonomy-term-reference-' ~ delta) }}>{{ item }}</li>
     {% endfor %}
   </ul>
 </div>