diff --git a/core/includes/pager.inc b/core/includes/pager.inc
index f4aae0a..80971a6 100644
--- a/core/includes/pager.inc
+++ b/core/includes/pager.inc
@@ -173,13 +173,14 @@ function pager_get_query_parameters() {
  *     - #quantity: The number of pages in the list.
  */
 function template_preprocess_pager(&$variables) {
+  $element = $variables['pager']['#element'];
   $parameters = $variables['pager']['#parameters'];
   $quantity = $variables['pager']['#quantity'];
   $route_name = $variables['pager']['#route_name'];
   $route_parameters = isset($variables['pager']['#route_parameters']) ? $variables['pager']['#route_parameters'] : [];
 
   // Prepare the pager object.
-  $pager = \Drupal::service('pager.factory')->get($variables['pager']['#element']);
+  $pager = \Drupal::service('pager.factory')->get($element);
 
   // Nothing to do if there is only one page.
   if ($pager->getTotalPages() <= 1) {
@@ -188,27 +189,29 @@ function template_preprocess_pager(&$variables) {
 
   $tags = $variables['pager']['#tags'];
 
-  // Calculate various markers within this pager list:
+  // Calculate various markers within this pager piece:
   // Middle is used to "center" pages around the current page.
-  $list_middle = ceil($quantity / 2);
-  // Current is the page we are currently paged to.
-  $list_current = $pager->getCurrentPage() + 1;
-  // First is the first page listed by this pager list (re quantity).
-  $list_first = $list_current - $list_middle + 1;
-  // Last is the last page listed by this pager list (re quantity).
-  $list_last = $list_current + $quantity - $list_middle;
+  $pager_middle = ceil($quantity / 2);
+  // current is the page we are currently paged to.
+  $pager_current = $pager->getCurrentPage() + 1;
+  // first is the first page listed by this pager piece (re quantity).
+  $pager_first = $pager_current - $pager_middle + 1;
+  // last is the last page listed by this pager piece (re quantity).
+  $pager_last = $pager_current + $quantity - $pager_middle;
+  // max is the maximum page number.
+  $pager_max = $pager->getTotalPages();
   // End of marker calculations.
 
   // Prepare for generation loop.
-  $i = $list_first;
-  if ($list_last > $pager->getTotalPages()) {
+  $i = $pager_first;
+  if ($pager_last > $pager_max) {
     // Adjust "center" if at end of query.
-    $i = $i + ($pager->getTotalPages() - $list_last);
-    $list_last = $pager->getTotalPages();
+    $i = $i + ($pager_max - $pager_last);
+    $pager_last = $pager_max;
   }
   if ($i <= 0) {
     // Adjust "center" if at start of query.
-    $list_last = $list_last + (1 - $i);
+    $pager_last = $pager_last + (1 - $i);
     $i = 1;
   }
   // End of generation loop preparation.
@@ -230,26 +233,26 @@ function template_preprocess_pager(&$variables) {
     }
   }
 
-  if ($i != $pager->getTotalPages()) {
+  if ($i != $pager_max) {
     // Add an ellipsis if there are further previous pages.
     if ($i > 1) {
       $variables['ellipses']['previous'] = TRUE;
     }
     // Now generate the actual pager piece.
-    for (; $i <= $list_last && $i <= $pager->getTotalPages(); $i++) {
+    for (; $i <= $pager_last && $i <= $pager_max; $i++) {
       $items['pages'][$i]['href'] = $pager->toUrl($i - 1, $parameters, $route_name, $route_parameters);
-      if ($i == $list_current) {
+      if ($i == $pager_current) {
         $variables['current'] = $i;
       }
     }
     // Add an ellipsis if there are further next pages.
-    if ($i < $pager->getTotalPages() + 1) {
+    if ($i < $pager_max + 1) {
       $variables['ellipses']['next'] = TRUE;
     }
   }
 
   // Create the "next" and "last" links if we are not on the last page.
-  if ($pager->getCurrentPage() < ($pager->getTotalPages() - 1)) {
+  if ($pager->getCurrentPage() < ($pager_max - 1)) {
     $items['next'] = [
       'href' => $pager->toUrl($pager->getCurrentPage() + 1, $parameters, $route_name, $route_parameters),
     ];
@@ -258,7 +261,7 @@ function template_preprocess_pager(&$variables) {
     }
 
     $items['last'] = [
-      'href' => $pager->toUrl($pager->getTotalPages() - 1, $parameters, $route_name, $route_parameters),
+      'href' => $pager->toUrl($pager_max - 1, $parameters, $route_name, $route_parameters),
     ];
     if (isset($tags[4])) {
       $items['last']['text'] = $tags[4];