diff --git a/search_api.views.inc b/search_api.views.inc
index e04eea47..52597775 100644
--- a/search_api.views.inc
+++ b/search_api.views.inc
@@ -241,7 +241,6 @@ function _search_api_views_get_handlers(FieldInterface $field) {
       }
     }
   }
-  // @todo Replace with multi-catch once we depend on PHP 7.1+.
   catch (SearchApiException | PluginNotFoundException $e) {
     $vars['%index'] = $field->getIndex()->label();
     $vars['%field'] = $field->getPrefixedLabel();
diff --git a/src/Entity/TaskStorageSchema.php b/src/Entity/TaskStorageSchema.php
index c09e72a3..c25c9be4 100644
--- a/src/Entity/TaskStorageSchema.php
+++ b/src/Entity/TaskStorageSchema.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\search_api\Entity;
 
-@trigger_error('\Drupal\search_api\Entity\TaskStorageSchema is deprecated in search_api:8.x-1.23 and is removed from search_api:2.0.0. There is no replacement. See https://www.drupal.org/node/3247781.', E_USER_DEPRECATED);
+@trigger_error('\Drupal\search_api\Entity\TaskStorageSchema is deprecated in search_api:8.x-1.23 and is removed from search_api:2.0.0. There is no replacement. See https://www.drupal.org/node/3247781', E_USER_DEPRECATED);
 
 use Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema;
 
diff --git a/src/Plugin/search_api/datasource/EntityDatasourceInterface.php b/src/Plugin/search_api/datasource/EntityDatasourceInterface.php
index 3805ddeb..adb67d19 100644
--- a/src/Plugin/search_api/datasource/EntityDatasourceInterface.php
+++ b/src/Plugin/search_api/datasource/EntityDatasourceInterface.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\search_api\Plugin\search_api\datasource;
 
-@trigger_error('\Drupal\search_api\Plugin\search_api\datasource\EntityDatasourceInterface is deprecated in search_api:8.x-1.16 and is removed from search_api:2.0.0. There is no replacement. See https://www.drupal.org/node/3103584.', E_USER_DEPRECATED);
+@trigger_error('\Drupal\search_api\Plugin\search_api\datasource\EntityDatasourceInterface is deprecated in search_api:8.x-1.16 and is removed from search_api:2.0.0. There is no replacement. See https://www.drupal.org/node/3103584', E_USER_DEPRECATED);
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\search_api\Datasource\DatasourceInterface;
diff --git a/src/Plugin/search_api/processor/AddHierarchy.php b/src/Plugin/search_api/processor/AddHierarchy.php
index 56466f30..d9213782 100644
--- a/src/Plugin/search_api/processor/AddHierarchy.php
+++ b/src/Plugin/search_api/processor/AddHierarchy.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\search_api\Plugin\search_api\processor;
 
+use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface;
@@ -282,10 +284,7 @@ public function preprocessIndexItems(array $items) {
             try {
               $this->addHierarchyValues($entity_type_id, $entity_id, $property, $field);
             }
-            // @todo Replace with multi-catch for
-            //   InvalidPluginDefinitionException and PluginNotFoundException
-            //   once we depend on PHP 7.1+.
-            catch (\Exception $e) {
+            catch (InvalidPluginDefinitionException | PluginNotFoundException $e) {
               $vars = [
                 '%index' => $this->index->label(),
                 '%field' => $field->getLabel(),
diff --git a/src/Plugin/views/field/SearchApiBulkForm.php b/src/Plugin/views/field/SearchApiBulkForm.php
index 48260a9c..3b5fb876 100644
--- a/src/Plugin/views/field/SearchApiBulkForm.php
+++ b/src/Plugin/views/field/SearchApiBulkForm.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\search_api\Plugin\views\field;
 
+use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
@@ -201,9 +203,7 @@ public function viewsFormValidate(&$form, FormStateInterface $form_state) {
         try {
           $entity = $this->loadEntityFromBulkFormKey($bulk_form_key);
         }
-        // @todo Replace with multi-catch for InvalidPluginDefinitionException
-        //   and PluginNotFoundException once we depend on PHP 7.1+.
-        catch (\Exception $e) {
+        catch (InvalidPluginDefinitionException | PluginNotFoundException $e) {
           $entity = NULL;
         }
         if (!$entity || $entity->getEntityTypeId() !== $action->getType()) {
diff --git a/src/Utility/PostRequestIndexing.php b/src/Utility/PostRequestIndexing.php
index 37ef9f64..5e2b55fb 100644
--- a/src/Utility/PostRequestIndexing.php
+++ b/src/Utility/PostRequestIndexing.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\search_api\Utility;
 
+use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\DestructableInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\search_api\LoggerTrait;
@@ -58,9 +60,7 @@ public function destruct() {
       try {
         $storage = $this->entityTypeManager->getStorage('search_api_index');
       }
-      // @todo Replace with multi-catch for InvalidPluginDefinitionException and
-      //   PluginNotFoundException once we depend on PHP 7.1+.
-      catch (\Exception $e) {
+      catch (InvalidPluginDefinitionException | PluginNotFoundException $e) {
         // It might be possible that the module got uninstalled during the rest
         // of the page request, or something else happened. To be on the safe
         // side, catch the exception in case the entity type isn't found.