diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 36aa685..f1a7b23 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -627,7 +627,7 @@ function comment_add(EntityInterface $entity, $field_name = 'comment', $pid = NU
  * @param int $comments_per_page
  *   The amount of comments to display per page.
  * @param int $pager_id
- *   (Optional) Pager id to use in case of multiple pagers on the one page.
+ *   (optional) Pager id to use in case of multiple pagers on the one page.
  *   Defaults to 0.
  *
  * @return
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php b/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
index f4790b1..b6ce094 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
@@ -205,7 +205,7 @@ public function settingsForm(array $form, array &$form_state) {
     $element['pager_id'] = array(
       '#type' => 'select',
       '#title' => $this->t('Pager ID'),
-      '#options' => drupal_map_assoc(range(0, 10)),
+      '#options' => range(0, 10),
       '#default_value' => empty($this->settings['pager_id']) ? 0 : $this->settings['pager_id'],
       '#description' => $this->t("Unless you're experiencing problems with pagers related to this field, you should leave this at 0. If using multiple pagers on one page you may need to set this number to a higher value so as not to conflict within the ?page= array. Large values will add a lot of commas to your URLs, so avoid if possible."),
     );