diff --git a/core/modules/filter/src/Element/ProcessedText.php b/core/modules/filter/src/Element/ProcessedText.php
index 52f0649..476ed66 100644
--- a/core/modules/filter/src/Element/ProcessedText.php
+++ b/core/modules/filter/src/Element/ProcessedText.php
@@ -98,8 +98,7 @@ public static function preRenderText($element) {
     $text = str_replace(array("\r\n", "\r"), "\n", $text);
 
     // Get a complete list of filters, ordered properly.
-    /** @var \Drupal\filter\Plugin\FilterInterface[] $filters **/
-    $filters = $format->filters();
+    $filters = $format->filters()->getInstances();
 
     // Give filters a chance to escape HTML-like data such as code or formulas.
     foreach ($filters as $filter) {
diff --git a/core/modules/filter/src/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php
index 6df0f97..89e410e 100644
--- a/core/modules/filter/src/Entity/FilterFormat.php
+++ b/core/modules/filter/src/Entity/FilterFormat.php
@@ -248,8 +248,7 @@ public function getPermissionName() {
   public function getFilterTypes() {
     $filter_types = array();
 
-    $filters = $this->filters();
-    foreach ($filters as $filter) {
+    foreach ($this->filters()->getInstances() as $filter) {
       if ($filter->status) {
         $filter_types[] = $filter->getType();
       }
@@ -401,8 +400,7 @@ public function removeFilter($instance_id) {
    */
   public function onDependencyRemoval(array $dependencies) {
     $changed = parent::onDependencyRemoval($dependencies);
-    $filters = $this->filters();
-    foreach ($filters as $filter) {
+    foreach ($this->filters()->getInstances() as $filter) {
       // Remove disabled filters, so that this FilterFormat config entity can
       // continue to exist.
       if (!$filter->status && in_array($filter->provider, $dependencies['module'])) {
diff --git a/core/modules/filter/src/FilterFormatFormBase.php b/core/modules/filter/src/FilterFormatFormBase.php
index e784836..ae7992b 100644
--- a/core/modules/filter/src/FilterFormatFormBase.php
+++ b/core/modules/filter/src/FilterFormatFormBase.php
@@ -27,6 +27,13 @@
   protected $queryFactory;
 
   /**
+   * The entity being used by this form.
+   *
+   * @var \Drupal\filter\FilterFormatInterface
+   */
+  protected $entity;
+
+  /**
    * Constructs a new FilterFormatFormBase.
    *
    * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
@@ -100,7 +107,7 @@ public function form(array $form, FormStateInterface $form_state) {
     // Create filter plugin instances for all available filters, including both
     // enabled/configured ones as well as new and not yet unconfigured ones.
     $filters = $format->filters();
-    foreach ($filters as $filter_id => $filter) {
+    foreach ($filters->getInstances() as $filter_id => $filter) {
       // When a filter is missing, it is replaced by the null filter. Remove it
       // here, so that saving the form will remove the missing filter.
       if ($filter instanceof FilterNull) {
diff --git a/core/modules/image/src/Entity/ImageStyle.php b/core/modules/image/src/Entity/ImageStyle.php
index a3c7ab5..611987e 100644
--- a/core/modules/image/src/Entity/ImageStyle.php
+++ b/core/modules/image/src/Entity/ImageStyle.php
@@ -285,7 +285,7 @@ public function createDerivative($original_uri, $derivative_uri) {
       return FALSE;
     }
 
-    foreach ($this->getEffects() as $effect) {
+    foreach ($this->getEffects()->getInstances() as $effect) {
       $effect->applyEffect($image);
     }
 
@@ -303,7 +303,7 @@ public function createDerivative($original_uri, $derivative_uri) {
    * {@inheritdoc}
    */
   public function transformDimensions(array &$dimensions) {
-    foreach ($this->getEffects() as $effect) {
+    foreach ($this->getEffects()->getInstances() as $effect) {
       $effect->transformDimensions($dimensions);
     }
   }
@@ -312,7 +312,7 @@ public function transformDimensions(array &$dimensions) {
    * {@inheritdoc}
    */
   public function getDerivativeExtension($extension) {
-    foreach ($this->getEffects() as $effect) {
+    foreach ($this->getEffects()->getInstances() as $effect) {
       $extension = $effect->getDerivativeExtension($extension);
     }
     return $extension;
diff --git a/core/modules/image/src/Form/ImageStyleEditForm.php b/core/modules/image/src/Form/ImageStyleEditForm.php
index bc58404..a8fae23 100644
--- a/core/modules/image/src/Form/ImageStyleEditForm.php
+++ b/core/modules/image/src/Form/ImageStyleEditForm.php
@@ -91,7 +91,7 @@ public function form(array $form, FormStateInterface $form_state) {
       // Render effects below parent elements.
       '#weight' => 5,
     );
-    foreach ($this->entity->getEffects() as $effect) {
+    foreach ($this->entity->getEffects()->getInstances() as $effect) {
       $key = $effect->getUuid();
       $form['effects'][$key]['#attributes']['class'][] = 'draggable';
       $form['effects'][$key]['#weight'] = isset($user_input['effects']) ? $user_input['effects'][$key]['weight'] : NULL;
diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
index df068ee..8d6923a 100644
--- a/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -143,7 +143,7 @@ function testStyle() {
     // Confirm that all effects on the image style have settings that match
     // what was saved.
     $uuids = array();
-    foreach ($style->getEffects() as $uuid => $effect) {
+    foreach ($style->getEffects()->getInstances() as $uuid => $effect) {
       // Store the uuid for later use.
       $uuids[$effect->getPluginId()] = $uuid;
       $effect_configuration = $effect->getConfiguration();
@@ -169,7 +169,7 @@ function testStyle() {
     $effect_edits_order = array_keys($effect_edits);
     $order_correct = TRUE;
     $index = 0;
-    foreach ($style->getEffects() as $effect) {
+    foreach ($style->getEffects()->getInstances() as $effect) {
       if ($effect_edits_order[$index] != $effect->getPluginId()) {
         $order_correct = FALSE;
       }
@@ -186,7 +186,7 @@ function testStyle() {
       'name' => $style_name,
       'label' => $style_label,
     );
-    foreach ($style->getEffects() as $uuid => $effect) {
+    foreach ($style->getEffects()->getInstances() as $uuid => $effect) {
       $edit['effects[' . $uuid . '][weight]'] = $weight;
       $weight--;
     }
@@ -217,7 +217,7 @@ function testStyle() {
     $effect_edits_order = array_reverse($effect_edits_order);
     $order_correct = TRUE;
     $index = 0;
-    foreach ($style->getEffects() as $effect) {
+    foreach ($style->getEffects()->getInstances() as $effect) {
       if ($effect_edits_order[$index] != $effect->getPluginId()) {
         $order_correct = FALSE;
       }
diff --git a/core/modules/image/src/Tests/ImageStyleFlushTest.php b/core/modules/image/src/Tests/ImageStyleFlushTest.php
index 1ebe27b..03fdcc8 100644
--- a/core/modules/image/src/Tests/ImageStyleFlushTest.php
+++ b/core/modules/image/src/Tests/ImageStyleFlushTest.php
@@ -95,7 +95,7 @@ function testFlush() {
     // forces an image style flush.
     $style_path = 'admin/config/media/image-styles/manage/' . $style->id();
     $uuids = array();
-    foreach ($style->getEffects() as $uuid => $effect) {
+    foreach ($style->getEffects()->getInstances() as $uuid => $effect) {
       $uuids[$effect->getPluginId()] = $uuid;
     }
     $this->drupalPostForm($style_path . '/effects/' . $uuids['image_scale'] . '/delete', array(), t('Delete'));