diff -u b/search_autocomplete.module b/search_autocomplete.module
--- b/search_autocomplete.module
+++ b/search_autocomplete.module
@@ -1,8 +1,8 @@
 <?php
 
-use Drupal\views\Views;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Url;
+use Drupal\views\Views;
 
 /**
  * @file
diff -u b/src/Form/AutocompletionConfigurationEditForm.php b/src/Form/AutocompletionConfigurationEditForm.php
--- b/src/Form/AutocompletionConfigurationEditForm.php
+++ b/src/Form/AutocompletionConfigurationEditForm.php
@@ -8,12 +8,12 @@
 
 namespace Drupal\search_autocomplete\Form;
 
+use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\search_autocomplete\Suggestion;
+use Drupal\views\Views;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Drupal\Component\Utility\UrlHelper;
-use Drupal\views\Views;
 
 /**
  * Class AutocompletionConfigurationEditForm
diff -u b/src/Form/AutocompletionConfigurationFormBase.php b/src/Form/AutocompletionConfigurationFormBase.php
--- b/src/Form/AutocompletionConfigurationFormBase.php
+++ b/src/Form/AutocompletionConfigurationFormBase.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Link;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -208,7 +209,7 @@
     $url = $autocompletion_configuration->toUrl();
 
     // Create an edit link.
-    $edit_link = $this->l(t('Edit'), $url);
+    $edit_link = Link::fromTextAndUrl(t('Edit'), $url);
 
     if ($status == SAVED_UPDATED) {
       // If we edited an existing entity...
diff -u b/src/Plugin/views/display/AutocompletionCallback.php b/src/Plugin/views/display/AutocompletionCallback.php
--- b/src/Plugin/views/display/AutocompletionCallback.php
+++ b/src/Plugin/views/display/AutocompletionCallback.php
@@ -8,17 +8,17 @@
 
 namespace Drupal\search_autocomplete\Plugin\views\display;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\MarkupTrait;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\CacheableResponse;
+use Drupal\Core\ContentNegotiation;
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\State\StateInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
-use Drupal\Core\ContentNegotiation;
+use Drupal\Core\State\StateInterface;
+use Drupal\views\Plugin\views\display\PathPluginBase;
 use Drupal\views\Plugin\views\display\ResponseDisplayPluginInterface;
 use Drupal\views\ViewExecutable;
-use Drupal\views\Plugin\views\display\PathPluginBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -292,7 +292,7 @@
       // executed by an HTML agent.
       // @todo Decide how to support non-HTML in the render API in
       //   https://www.drupal.org/node/2501313.
-      $build['#markup'] = SafeMarkup::set($build['#markup']);
+      $build['#markup'] = MarkupTrait::create($build['#markup']);
     }
 
     parent::applyDisplayCachablityMetadata($build);
diff -u b/src/Tests/Views/CallbackViewsTest.php b/src/Tests/Views/CallbackViewsTest.php
--- b/src/Tests/Views/CallbackViewsTest.php
+++ b/src/Tests/Views/CallbackViewsTest.php
@@ -12,8 +12,8 @@
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Utility\Html;
-use Drupal\views\Tests\ViewTestBase;
 use Drupal\node\Entity\Node;
+use Drupal\views\Tests\ViewTestBase;
 
 /**
  * Test callback view configurations.
only in patch2:
unchanged:
--- a/src/AutocompletionConfigurationAccessControlHandler.php
+++ b/src/AutocompletionConfigurationAccessControlHandler.php
@@ -8,10 +8,10 @@
 
 namespace Drupal\search_autocomplete;
 
+use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Access\AccessResult;
 
 /**
  * Defines an access controller for the autocompletion_configuration entity.
only in patch2:
unchanged:
--- a/src/Form/AutocompletionConfigurationDeleteForm.php
+++ b/src/Form/AutocompletionConfigurationDeleteForm.php
@@ -9,8 +9,8 @@
 namespace Drupal\search_autocomplete\Form;
 
 use Drupal\Core\Entity\EntityConfirmFormBase;
-use Drupal\Core\Url;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
 
 /**
  * Class AutocompletionConfigurationDeleteForm.
only in patch2:
unchanged:
--- a/src/Plugin/views/row/CallbackFieldRow.php
+++ b/src/Plugin/views/row/CallbackFieldRow.php
@@ -10,9 +10,9 @@
 namespace Drupal\search_autocomplete\Plugin\views\row;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\Plugin\views\row\RowPluginBase;
+use Drupal\views\ViewExecutable;
 
 /**
  * Plugin which displays fields as raw data.