diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 9895b1f..6b2813a 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -430,12 +430,12 @@ function comment_permalink(Comment $comment) {
     $page = comment_get_display_page($comment->id(), $node->type);
 
     // @todo: Cleaner sub request handling.
-    $request = drupal_container()->get('request');
+    $request = Drupal::request();
     $subrequest = Request::create('/node/' . $node->nid, 'GET', $request->query->all(), $request->cookies->all(), array(), $request->server->all());
     $subrequest->query->set('page', $page);
     // @todo: Convert the pager to use the request object.
     $_GET['page'] = $page;
-    return drupal_container()->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
+    return Drupal::service('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
   }
   throw new NotFoundHttpException();
 }
@@ -954,7 +954,7 @@ function comment_links(Comment $comment, EntityInterface $node) {
   }
 
   // Add translations link for translation-enabled comment bundles.
-  if (module_exists('translation_entity') && translation_entity_translate_access($comment)) {
+  if (Drupal::moduleHandler()->moduleExists('translation_entity') && translation_entity_translate_access($comment)) {
     $links['comment-translations'] = array(
       'title' => t('translations'),
       'href' => 'comment/' . $comment->id() . '/translations',
@@ -1059,7 +1059,7 @@ function comment_form_node_type_form_alter(&$form, $form_state) {
       ),
     );
     // @todo Remove this check once language settings are generalized.
-    if (module_exists('translation_entity')) {
+    if (Drupal::moduleHandler()->moduleExists('translation_entity')) {
       $comment_form = $form;
       $comment_form_state['translation_entity']['key'] = 'language_configuration';
       $form['comment'] += translation_entity_enable_widget('comment', 'comment_node_' . $form['#node_type']->type, $comment_form, $comment_form_state);
@@ -1392,7 +1392,7 @@ function comment_load($cid, $reset = FALSE) {
 function comment_num_new($nid, $timestamp = 0) {
   global $user;
 
-  if ($user->uid && module_exists('history')) {
+  if ($user->uid && Drupal::moduleHandler()->moduleExists('history')) {
     // Retrieve the timestamp at which the current user last viewed this node.
     if (!$timestamp) {
       $timestamp = history_read($nid);
diff --git a/core/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc
index 5e1b190..cc2d63d 100644
--- a/core/modules/comment/comment.pages.inc
+++ b/core/modules/comment/comment.pages.inc
@@ -111,7 +111,7 @@ function comment_approve(Comment $comment) {
   // @todo CSRF tokens are validated in page callbacks rather than access
   //   callbacks, because access callbacks are also invoked during menu link
   //   generation. Add token support to routing: http://drupal.org/node/755584.
-  $token = drupal_container()->get('request')->query->get('token');
+  $token = Drupal::request()->query->get('token');
   if (!isset($token) || !drupal_valid_token($token, 'comment/' . $comment->id() . '/approve')) {
     throw new AccessDeniedHttpException();
   }
diff --git a/core/modules/comment/comment.views.inc b/core/modules/comment/comment.views.inc
index 6cc6c31..74db3c2 100644
--- a/core/modules/comment/comment.views.inc
+++ b/core/modules/comment/comment.views.inc
@@ -141,7 +141,7 @@ function comment_views_data() {
     ),
   );
 
-  if (module_exists('language')) {
+  if (Drupal::moduleHandler()->moduleExists('language')) {
     $data['comment']['langcode'] = array(
       'title' => t('Language'),
       'help' => t('The language the comment is in.'),
@@ -360,7 +360,7 @@ function comment_views_data() {
     ),
   );
 
-  if (drupal_container()->get('module_handler')->moduleExists('translation_entity')) {
+  if (Drupal::moduleHandler()->moduleExists('translation_entity')) {
     $data['comment']['translation_link'] = array(
       'title' => t('Translation link'),
       'help' => t('Provide a link to the translations overview for comments.'),
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
index db5bba9..d0ce871 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
@@ -37,7 +37,7 @@ public function query() {
         )
       )
     );
-    $join = drupal_container()->get('plugin.manager.views.join')->createInstance('standard', $definition);
+    $join = \Drupal::service('plugin.manager.views.join')->createInstance('standard', $definition);
 
     // ncs_user alias so this can work with the sort handler, below.
 //    $this->user_table = $this->query->add_relationship(NULL, $join, 'users', $this->relationship);
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
index 9e2c70e..89fe19b 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
@@ -28,7 +28,7 @@ public function query() {
       'left_table' => $this->tableAlias,
       'left_field' => 'last_comment_uid',
     );
-    $join = drupal_container()->get('plugin.manager.views.join')->createInstance('standard', $definition);
+    $join = \Drupal::service('plugin.manager.views.join')->createInstance('standard', $definition);
 
     // @todo this might be safer if we had an ensure_relationship rather than guessing
     // the table alias. Though if we did that we'd be guessing the relationship name