diff --git a/core/modules/aggregator/src/Plugin/views/argument/Fid.php b/core/modules/aggregator/src/Plugin/views/argument/Fid.php
index f9d2481..7561694 100644
--- a/core/modules/aggregator/src/Plugin/views/argument/Fid.php
+++ b/core/modules/aggregator/src/Plugin/views/argument/Fid.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Plugin\views\argument;
 
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\views\Plugin\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\NumericArgument;
 use Drupal\Component\Utility\String;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -19,7 +19,7 @@
  *
  * @ViewsArgument("aggregator_fid")
  */
-class Fid extends Numeric {
+class Fid extends NumericArgument {
 
   /**
    * The entity manager service.
diff --git a/core/modules/aggregator/src/Plugin/views/argument/Iid.php b/core/modules/aggregator/src/Plugin/views/argument/Iid.php
index 7fca201..1c95afa 100644
--- a/core/modules/aggregator/src/Plugin/views/argument/Iid.php
+++ b/core/modules/aggregator/src/Plugin/views/argument/Iid.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Plugin\views\argument;
 
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\views\Plugin\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\NumericArgument;
 use Drupal\Component\Utility\String;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -19,7 +19,7 @@
  *
  * @ViewsArgument("aggregator_iid")
  */
-class Iid extends Numeric {
+class Iid extends NumericArgument {
 
   /**
    * The entity manager service.
diff --git a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
index 40b8a59..2328fec 100644
--- a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
+++ b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Connection;
 use Drupal\comment\CommentInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\Plugin\views\field\Numeric;
+use Drupal\views\Plugin\views\field\NumericField;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\ResultRow;
 use Drupal\views\ViewExecutable;
@@ -23,7 +23,7 @@
  *
  * @ViewsField("node_new_comments")
  */
-class NodeNewComments extends Numeric {
+class NodeNewComments extends NumericField {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/file/src/Plugin/views/argument/Fid.php b/core/modules/file/src/Plugin/views/argument/Fid.php
index bca81f7..7548901 100644
--- a/core/modules/file/src/Plugin/views/argument/Fid.php
+++ b/core/modules/file/src/Plugin/views/argument/Fid.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\Query\QueryFactory;
-use Drupal\views\Plugin\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\NumericArgument;
 use Drupal\Component\Utility\String;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -21,7 +21,7 @@
  *
  * @ViewsArgument("file_fid")
  */
-class Fid extends Numeric implements ContainerFactoryPluginInterface {
+class Fid extends NumericArgument implements ContainerFactoryPluginInterface {
 
   /**
    * The entity manager service
diff --git a/core/modules/node/src/Plugin/views/argument/Nid.php b/core/modules/node/src/Plugin/views/argument/Nid.php
index 07f93ec..7ef1d93 100644
--- a/core/modules/node/src/Plugin/views/argument/Nid.php
+++ b/core/modules/node/src/Plugin/views/argument/Nid.php
@@ -9,7 +9,7 @@
 
 use Drupal\Component\Utility\String;
 use Drupal\node\NodeStorageInterface;
-use Drupal\views\Plugin\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\NumericArgument;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -17,7 +17,7 @@
  *
  * @ViewsArgument("node_nid")
  */
-class Nid extends Numeric {
+class Nid extends NumericArgument {
 
   /**
    * The node storage.
diff --git a/core/modules/node/src/Plugin/views/argument/Type.php b/core/modules/node/src/Plugin/views/argument/Type.php
index eb1e107..ec03b48 100644
--- a/core/modules/node/src/Plugin/views/argument/Type.php
+++ b/core/modules/node/src/Plugin/views/argument/Type.php
@@ -9,7 +9,7 @@
 
 use Drupal\Component\Utility\String as UtilityString;
 use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\views\Plugin\views\argument\String;
+use Drupal\views\Plugin\views\argument\StringArgument;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -17,7 +17,7 @@
  *
  * @ViewsArgument("node_type")
  */
-class Type extends String {
+class Type extends StringArgument {
 
   /**
    * NodeType storage controller.
diff --git a/core/modules/node/src/Plugin/views/argument/Vid.php b/core/modules/node/src/Plugin/views/argument/Vid.php
index 43246d8..2c93d9d 100644
--- a/core/modules/node/src/Plugin/views/argument/Vid.php
+++ b/core/modules/node/src/Plugin/views/argument/Vid.php
@@ -9,7 +9,7 @@
 
 use Drupal\Component\Utility\String;
 use Drupal\Core\Database\Connection;
-use Drupal\views\Plugin\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\NumericArgument;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\node\NodeStorageInterface;
 
@@ -18,7 +18,7 @@
  *
  * @ViewsArgument("node_vid")
  */
-class Vid extends Numeric {
+class Vid extends NumericArgument {
 
   /**
    * Database Service Object.
diff --git a/core/modules/options/src/Plugin/views/argument/NumberListField.php b/core/modules/options/src/Plugin/views/argument/NumberListField.php
index 792381c..007bcdd 100644
--- a/core/modules/options/src/Plugin/views/argument/NumberListField.php
+++ b/core/modules/options/src/Plugin/views/argument/NumberListField.php
@@ -13,7 +13,7 @@
 use Drupal\views\FieldAPIHandlerTrait;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Plugin\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\NumericArgument;
 
 /**
  * Argument handler for list field to show the human readable name in the
@@ -23,7 +23,7 @@
  *
  * @ViewsArgument("number_list_field")
  */
-class NumberListField extends Numeric {
+class NumberListField extends NumericArgument {
 
   use AllowedTagsXssTrait;
   use FieldAPIHandlerTrait;
diff --git a/core/modules/options/src/Plugin/views/argument/StringListField.php b/core/modules/options/src/Plugin/views/argument/StringListField.php
index da715c4..0825bb1 100644
--- a/core/modules/options/src/Plugin/views/argument/StringListField.php
+++ b/core/modules/options/src/Plugin/views/argument/StringListField.php
@@ -12,7 +12,7 @@
 use Drupal\views\FieldAPIHandlerTrait;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Plugin\views\argument\String;
+use Drupal\views\Plugin\views\argument\StringArgument;
 use Drupal\Component\Utility\String as StringUtility;
 
 /**
@@ -22,7 +22,7 @@
  *
  * @ViewsArgument("string_list_field")
  */
-class StringListField extends String {
+class StringListField extends StringArgument {
 
   use AllowedTagsXssTrait;
   use FieldAPIHandlerTrait;
diff --git a/core/modules/search/src/Plugin/views/field/Score.php b/core/modules/search/src/Plugin/views/field/Score.php
index bb5c3fe..7d093b7 100644
--- a/core/modules/search/src/Plugin/views/field/Score.php
+++ b/core/modules/search/src/Plugin/views/field/Score.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\search\Plugin\views\field;
 
-use Drupal\views\Plugin\views\field\Numeric;
+use Drupal\views\Plugin\views\field\NumericField;
 use Drupal\views\ResultRow;
 
 /**
@@ -17,7 +17,7 @@
  *
  * @ViewsField("search_score")
  */
-class Score extends Numeric {
+class Score extends NumericField {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php b/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
index 41a7f5d..87704ed 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\views\Plugin\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\NumericArgument;
 use Drupal\Component\Utility\String;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -20,7 +20,7 @@
  *
  * @ViewsArgument("taxonomy")
  */
-class Taxonomy extends Numeric implements ContainerFactoryPluginInterface {
+class Taxonomy extends NumericArgument implements ContainerFactoryPluginInterface {
 
   /**
    * @var EntityStorageInterface
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php b/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
index 597f826..2b92822 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\taxonomy\Plugin\views\argument;
 
-use Drupal\views\Plugin\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\NumericArgument;
 use Drupal\Component\Utility\String;
 use Drupal\taxonomy\VocabularyStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -19,7 +19,7 @@
  *
  * @ViewsArgument("vocabulary_vid")
  */
-class VocabularyVid extends Numeric {
+class VocabularyVid extends NumericArgument {
 
   /**
     * The vocabulary storage.
diff --git a/core/modules/user/src/Plugin/views/argument/Uid.php b/core/modules/user/src/Plugin/views/argument/Uid.php
index 2c4a087..63db23c 100644
--- a/core/modules/user/src/Plugin/views/argument/Uid.php
+++ b/core/modules/user/src/Plugin/views/argument/Uid.php
@@ -9,7 +9,7 @@
 
 use Drupal\Component\Utility\String;
 use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\views\Plugin\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\NumericArgument;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -19,7 +19,7 @@
  *
  * @ViewsArgument("user_uid")
  */
-class Uid extends Numeric {
+class Uid extends NumericArgument {
 
   /**
    * The user storage.
diff --git a/core/modules/views/src/Plugin/views/argument/FieldList.php b/core/modules/views/src/Plugin/views/argument/FieldList.php
index 39d02cb..64d9bb4 100644
--- a/core/modules/views/src/Plugin/views/argument/FieldList.php
+++ b/core/modules/views/src/Plugin/views/argument/FieldList.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Plugin\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\NumericArgument;
 
 /**
  * Argument handler for list field to show the human readable name in the
@@ -22,7 +22,7 @@
  *
  * @ViewsArgument("field_list")
  */
-class FieldList extends Numeric {
+class FieldList extends NumericArgument {
 
   use AllowedTagsXssTrait;
 
diff --git a/core/modules/views/src/Plugin/views/argument/ListString.php b/core/modules/views/src/Plugin/views/argument/ListString.php
index f24ca79..57a9308 100644
--- a/core/modules/views/src/Plugin/views/argument/ListString.php
+++ b/core/modules/views/src/Plugin/views/argument/ListString.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Plugin\views\argument\String;
+use Drupal\views\Plugin\views\argument\StringArgument;
 
 /**
  * Argument handler for list field to show the human readable name in the
@@ -22,7 +22,7 @@
  *
  * @ViewsArgument("field_list_string")
  */
-class ListString extends String {
+class ListString extends StringArgument {
 
   use AllowedTagsXssTrait;
 
diff --git a/core/modules/views/src/Plugin/views/argument/Numeric.php b/core/modules/views/src/Plugin/views/argument/Numeric.php
deleted file mode 100644
index e926da3..0000000
--- a/core/modules/views/src/Plugin/views/argument/Numeric.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\views\Plugin\views\argument\Numeric.
- */
-
-namespace Drupal\views\Plugin\views\argument;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Basic argument handler for arguments that are numeric. Incorporates
- * break_phrase.
- *
- * @ingroup views_argument_handlers
- *
- * @ViewsArgument("numeric")
- */
-class Numeric extends ArgumentPluginBase {
-
-  /**
-   * The operator used for the query: or|and.
-   * @var string
-   */
-  var $operator;
-
-  /**
-   * The actual value which is used for querying.
-   * @var array
-   */
-  var $value;
-
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-
-    $options['break_phrase'] = array('default' => FALSE);
-    $options['not'] = array('default' => FALSE);
-
-    return $options;
-  }
-
-  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    parent::buildOptionsForm($form, $form_state);
-
-    // allow + for or, , for and
-    $form['break_phrase'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Allow multiple values'),
-      '#description' => $this->t('If selected, users can enter multiple values in the form of 1+2+3 (for OR) or 1,2,3 (for AND).'),
-      '#default_value' => !empty($this->options['break_phrase']),
-      '#fieldset' => 'more',
-    );
-
-    $form['not'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Exclude'),
-      '#description' => $this->t('If selected, the numbers entered for the filter will be excluded rather than limiting the view.'),
-      '#default_value' => !empty($this->options['not']),
-      '#fieldset' => 'more',
-    );
-  }
-
-  function title() {
-    if (!$this->argument) {
-      return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : $this->t('Uncategorized');
-    }
-
-    if (!empty($this->options['break_phrase'])) {
-      $break = static::breakString($this->argument, TRUE);
-      $this->value = $break->value;
-      $this->operator = $break->operator;
-    }
-    else {
-      $this->value = array($this->argument);
-      $this->operator = 'or';
-    }
-
-    if (empty($this->value)) {
-      return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : $this->t('Uncategorized');
-    }
-
-    if ($this->value === array(-1)) {
-      return !empty($this->definition['invalid input']) ? $this->definition['invalid input'] : $this->t('Invalid input');
-    }
-
-    return implode($this->operator == 'or' ? ' + ' : ', ', $this->titleQuery());
-  }
-
-  /**
-   * Override for specific title lookups.
-   * @return array
-   *    Returns all titles, if it's just one title it's an array with one entry.
-   */
-  public function titleQuery() {
-    return $this->value;
-  }
-
-  public function query($group_by = FALSE) {
-    $this->ensureMyTable();
-
-    if (!empty($this->options['break_phrase'])) {
-      $break = static::breakString($this->argument, TRUE);
-      $this->value = $break->value;
-      $this->operator = $break->operator;
-    }
-    else {
-      $this->value = array($this->argument);
-    }
-
-    $placeholder = $this->placeholder();
-    $null_check = empty($this->options['not']) ? '' : "OR $this->tableAlias.$this->realField IS NULL";
-
-    if (count($this->value) > 1) {
-      $operator = empty($this->options['not']) ? 'IN' : 'NOT IN';
-      $placeholder .= '[]';
-      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator($placeholder) $null_check", array($placeholder => $this->value));
-    }
-    else {
-      $operator = empty($this->options['not']) ? '=' : '!=';
-      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator $placeholder $null_check", array($placeholder => $this->argument));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSortName() {
-    return $this->t('Numerical', array(), array('context' => 'Sort order'));
-  }
-
-}
diff --git a/core/modules/views/src/Plugin/views/argument/NumericArgument.php b/core/modules/views/src/Plugin/views/argument/NumericArgument.php
new file mode 100644
index 0000000..5203a62
--- /dev/null
+++ b/core/modules/views/src/Plugin/views/argument/NumericArgument.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\views\Plugin\views\argument\Numeric.
+ */
+
+namespace Drupal\views\Plugin\views\argument;
+
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Basic argument handler for arguments that are numeric. Incorporates
+ * break_phrase.
+ *
+ * @ingroup views_argument_handlers
+ *
+ * @ViewsArgument("numeric")
+ */
+class NumericArgument extends ArgumentPluginBase {
+
+  /**
+   * The operator used for the query: or|and.
+   * @var string
+   */
+  var $operator;
+
+  /**
+   * The actual value which is used for querying.
+   * @var array
+   */
+  var $value;
+
+  protected function defineOptions() {
+    $options = parent::defineOptions();
+
+    $options['break_phrase'] = array('default' => FALSE);
+    $options['not'] = array('default' => FALSE);
+
+    return $options;
+  }
+
+  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
+    parent::buildOptionsForm($form, $form_state);
+
+    // allow + for or, , for and
+    $form['break_phrase'] = array(
+      '#type' => 'checkbox',
+      '#title' => $this->t('Allow multiple values'),
+      '#description' => $this->t('If selected, users can enter multiple values in the form of 1+2+3 (for OR) or 1,2,3 (for AND).'),
+      '#default_value' => !empty($this->options['break_phrase']),
+      '#fieldset' => 'more',
+    );
+
+    $form['not'] = array(
+      '#type' => 'checkbox',
+      '#title' => $this->t('Exclude'),
+      '#description' => $this->t('If selected, the numbers entered for the filter will be excluded rather than limiting the view.'),
+      '#default_value' => !empty($this->options['not']),
+      '#fieldset' => 'more',
+    );
+  }
+
+  function title() {
+    if (!$this->argument) {
+      return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : $this->t('Uncategorized');
+    }
+
+    if (!empty($this->options['break_phrase'])) {
+      $break = static::breakString($this->argument, TRUE);
+      $this->value = $break->value;
+      $this->operator = $break->operator;
+    }
+    else {
+      $this->value = array($this->argument);
+      $this->operator = 'or';
+    }
+
+    if (empty($this->value)) {
+      return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : $this->t('Uncategorized');
+    }
+
+    if ($this->value === array(-1)) {
+      return !empty($this->definition['invalid input']) ? $this->definition['invalid input'] : $this->t('Invalid input');
+    }
+
+    return implode($this->operator == 'or' ? ' + ' : ', ', $this->titleQuery());
+  }
+
+  /**
+   * Override for specific title lookups.
+   * @return array
+   *    Returns all titles, if it's just one title it's an array with one entry.
+   */
+  public function titleQuery() {
+    return $this->value;
+  }
+
+  public function query($group_by = FALSE) {
+    $this->ensureMyTable();
+
+    if (!empty($this->options['break_phrase'])) {
+      $break = static::breakString($this->argument, TRUE);
+      $this->value = $break->value;
+      $this->operator = $break->operator;
+    }
+    else {
+      $this->value = array($this->argument);
+    }
+
+    $placeholder = $this->placeholder();
+    $null_check = empty($this->options['not']) ? '' : "OR $this->tableAlias.$this->realField IS NULL";
+
+    if (count($this->value) > 1) {
+      $operator = empty($this->options['not']) ? 'IN' : 'NOT IN';
+      $placeholder .= '[]';
+      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator($placeholder) $null_check", array($placeholder => $this->value));
+    }
+    else {
+      $operator = empty($this->options['not']) ? '=' : '!=';
+      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator $placeholder $null_check", array($placeholder => $this->argument));
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getSortName() {
+    return $this->t('Numerical', array(), array('context' => 'Sort order'));
+  }
+
+}
diff --git a/core/modules/views/src/Plugin/views/argument/String.php b/core/modules/views/src/Plugin/views/argument/String.php
deleted file mode 100644
index b542bfb..0000000
--- a/core/modules/views/src/Plugin/views/argument/String.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\views\Plugin\views\argument\String.
- */
-
-namespace Drupal\views\Plugin\views\argument;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\ViewExecutable;
-use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\ManyToOneHelper;
-
-/**
- * Basic argument handler to implement string arguments that may have length
- * limits.
- *
- * @ingroup views_argument_handlers
- *
- * @ViewsArgument("string")
- */
-class String extends ArgumentPluginBase {
-
-  /**
-   * Overrides \Drupal\views\Plugin\views\argument\ArgumentPluginBase::init().
-   */
-  public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
-    parent::init($view, $display, $options);
-
-    if (!empty($this->definition['many to one'])) {
-      $this->helper = new ManyToOneHelper($this);
-
-      // Ensure defaults for these, during summaries and stuff:
-      $this->operator = 'or';
-      $this->value = array();
-    }
-  }
-
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-
-    $options['glossary'] = array('default' => FALSE);
-    $options['limit'] = array('default' => 0);
-    $options['case'] = array('default' => 'none');
-    $options['path_case'] = array('default' => 'none');
-    $options['transform_dash'] = array('default' => FALSE);
-    $options['break_phrase'] = array('default' => FALSE);
-
-    if (!empty($this->definition['many to one'])) {
-      $options['add_table'] = array('default' => FALSE);
-      $options['require_value'] = array('default' => FALSE);
-    }
-
-    return $options;
-  }
-
-  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    parent::buildOptionsForm($form, $form_state);
-
-    $form['glossary'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Glossary mode'),
-      '#description' => $this->t('Glossary mode applies a limit to the number of characters used in the filter value, which allows the summary view to act as a glossary.'),
-      '#default_value' => $this->options['glossary'],
-      '#fieldset' => 'more',
-    );
-
-    $form['limit'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Character limit'),
-      '#description' => $this->t('How many characters of the filter value to filter against. If set to 1, all fields starting with the first letter in the filter value would be matched.'),
-      '#default_value' => $this->options['limit'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[glossary]"]' => array('checked' => TRUE),
-        ),
-      ),
-      '#fieldset' => 'more',
-    );
-
-    $form['case'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Case'),
-      '#description' => $this->t('When printing the title and summary, how to transform the case of the filter value.'),
-      '#options' => array(
-        'none' => $this->t('No transform'),
-        'upper' => $this->t('Upper case'),
-        'lower' => $this->t('Lower case'),
-        'ucfirst' => $this->t('Capitalize first letter'),
-        'ucwords' => $this->t('Capitalize each word'),
-      ),
-      '#default_value' => $this->options['case'],
-      '#fieldset' => 'more',
-    );
-
-    $form['path_case'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Case in path'),
-      '#description' => $this->t('When printing url paths, how to transform the case of the filter value. Do not use this unless with Postgres as it uses case sensitive comparisons.'),
-      '#options' => array(
-        'none' => $this->t('No transform'),
-        'upper' => $this->t('Upper case'),
-        'lower' => $this->t('Lower case'),
-        'ucfirst' => $this->t('Capitalize first letter'),
-        'ucwords' => $this->t('Capitalize each word'),
-      ),
-      '#default_value' => $this->options['path_case'],
-      '#fieldset' => 'more',
-    );
-
-    $form['transform_dash'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Transform spaces to dashes in URL'),
-      '#default_value' => $this->options['transform_dash'],
-      '#fieldset' => 'more',
-    );
-
-    if (!empty($this->definition['many to one'])) {
-      $form['add_table'] = array(
-        '#type' => 'checkbox',
-        '#title' => $this->t('Allow multiple filter values to work together'),
-        '#description' => $this->t('If selected, multiple instances of this filter can work together, as though multiple values were supplied to the same filter. This setting is not compatible with the "Reduce duplicates" setting.'),
-        '#default_value' => !empty($this->options['add_table']),
-        '#fieldset' => 'more',
-      );
-
-      $form['require_value'] = array(
-        '#type' => 'checkbox',
-        '#title' => $this->t('Do not display items with no value in summary'),
-        '#default_value' => !empty($this->options['require_value']),
-        '#fieldset' => 'more',
-      );
-    }
-
-    // allow + for or, , for and
-    $form['break_phrase'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Allow multiple values'),
-      '#description' => $this->t('If selected, users can enter multiple values in the form of 1+2+3 (for OR) or 1,2,3 (for AND).'),
-      '#default_value' => !empty($this->options['break_phrase']),
-      '#fieldset' => 'more',
-    );
-  }
-
-  /**
-   * Build the summary query based on a string
-   */
-  protected function summaryQuery() {
-    if (empty($this->definition['many to one'])) {
-      $this->ensureMyTable();
-    }
-    else {
-      $this->tableAlias = $this->helper->summaryJoin();
-    }
-
-    if (empty($this->options['glossary'])) {
-      // Add the field.
-      $this->base_alias = $this->query->addField($this->tableAlias, $this->realField);
-      $this->query->setCountField($this->tableAlias, $this->realField);
-    }
-    else {
-      // Add the field.
-      $formula = $this->getFormula();
-      $this->base_alias = $this->query->addField(NULL, $formula, $this->field . '_truncated');
-      $this->query->setCountField(NULL, $formula, $this->field, $this->field . '_truncated');
-    }
-
-    $this->summaryNameField();
-    return $this->summaryBasics(FALSE);
-  }
-
-  /**
-   * Get the formula for this argument.
-   *
-   * $this->ensureMyTable() MUST have been called prior to this.
-   */
-  public function getFormula() {
-    return "SUBSTRING($this->tableAlias.$this->realField, 1, " . intval($this->options['limit']) . ")";
-  }
-
-  /**
-   * Build the query based upon the formula
-   */
-  public function query($group_by = FALSE) {
-    $argument = $this->argument;
-    if (!empty($this->options['transform_dash'])) {
-      $argument = strtr($argument, '-', ' ');
-    }
-
-    if (!empty($this->options['break_phrase'])) {
-      $this->unpackArgumentValue();
-    }
-    else {
-      $this->value = array($argument);
-      $this->operator = 'or';
-    }
-
-    if (!empty($this->definition['many to one'])) {
-      if (!empty($this->options['glossary'])) {
-        $this->helper->formula = TRUE;
-      }
-      $this->helper->ensureMyTable();
-      $this->helper->addFilter();
-      return;
-    }
-
-    $this->ensureMyTable();
-    $formula = FALSE;
-    if (empty($this->options['glossary'])) {
-      $field = "$this->tableAlias.$this->realField";
-    }
-    else {
-      $formula = TRUE;
-      $field = $this->getFormula();
-    }
-
-    if (count($this->value) > 1) {
-      $operator = 'IN';
-      $argument = $this->value;
-    }
-    else {
-      $operator = '=';
-    }
-
-    if ($formula) {
-      $placeholder = $this->placeholder();
-      if ($operator == 'IN') {
-        $field .= " IN($placeholder)";
-      }
-      else {
-        $field .= ' = ' . $placeholder;
-      }
-      $placeholders = array(
-        $placeholder => $argument,
-      );
-      $this->query->addWhereExpression(0, $field, $placeholders);
-    }
-    else {
-      $this->query->addWhere(0, $field, $argument, $operator);
-    }
-  }
-
-  public function summaryArgument($data) {
-    $value = $this->caseTransform($data->{$this->base_alias}, $this->options['path_case']);
-    if (!empty($this->options['transform_dash'])) {
-      $value = strtr($value, ' ', '-');
-    }
-    return $value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSortName() {
-    return $this->t('Alphabetical', array(), array('context' => 'Sort order'));
-  }
-
-  function title() {
-    $this->argument = $this->caseTransform($this->argument, $this->options['case']);
-    if (!empty($this->options['transform_dash'])) {
-      $this->argument = strtr($this->argument, '-', ' ');
-    }
-
-    if (!empty($this->options['break_phrase'])) {
-      $this->unpackArgumentValue();
-    }
-    else {
-      $this->value = array($this->argument);
-      $this->operator = 'or';
-    }
-
-    if (empty($this->value)) {
-      return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : $this->t('Uncategorized');
-    }
-
-    if ($this->value === array(-1)) {
-      return !empty($this->definition['invalid input']) ? $this->definition['invalid input'] : $this->t('Invalid input');
-    }
-
-    return implode($this->operator == 'or' ? ' + ' : ', ', $this->titleQuery());
-  }
-
-  /**
-   * Override for specific title lookups.
-   */
-  public function titleQuery() {
-    return array_map('\Drupal\Component\Utility\String::checkPlain', array_combine($this->value, $this->value));
-  }
-
-  public function summaryName($data) {
-    return $this->caseTransform(parent::summaryName($data), $this->options['case']);
-  }
-
-}
diff --git a/core/modules/views/src/Plugin/views/argument/StringArgument.php b/core/modules/views/src/Plugin/views/argument/StringArgument.php
new file mode 100644
index 0000000..0d94cd2
--- /dev/null
+++ b/core/modules/views/src/Plugin/views/argument/StringArgument.php
@@ -0,0 +1,295 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\views\Plugin\views\argument\String.
+ */
+
+namespace Drupal\views\Plugin\views\argument;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\views\ViewExecutable;
+use Drupal\views\Plugin\views\display\DisplayPluginBase;
+use Drupal\views\ManyToOneHelper;
+
+/**
+ * Basic argument handler to implement string arguments that may have length
+ * limits.
+ *
+ * @ingroup views_argument_handlers
+ *
+ * @ViewsArgument("string")
+ */
+class StringArgument extends ArgumentPluginBase {
+
+  /**
+   * Overrides \Drupal\views\Plugin\views\argument\ArgumentPluginBase::init().
+   */
+  public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
+    parent::init($view, $display, $options);
+
+    if (!empty($this->definition['many to one'])) {
+      $this->helper = new ManyToOneHelper($this);
+
+      // Ensure defaults for these, during summaries and stuff:
+      $this->operator = 'or';
+      $this->value = array();
+    }
+  }
+
+  protected function defineOptions() {
+    $options = parent::defineOptions();
+
+    $options['glossary'] = array('default' => FALSE);
+    $options['limit'] = array('default' => 0);
+    $options['case'] = array('default' => 'none');
+    $options['path_case'] = array('default' => 'none');
+    $options['transform_dash'] = array('default' => FALSE);
+    $options['break_phrase'] = array('default' => FALSE);
+
+    if (!empty($this->definition['many to one'])) {
+      $options['add_table'] = array('default' => FALSE);
+      $options['require_value'] = array('default' => FALSE);
+    }
+
+    return $options;
+  }
+
+  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
+    parent::buildOptionsForm($form, $form_state);
+
+    $form['glossary'] = array(
+      '#type' => 'checkbox',
+      '#title' => $this->t('Glossary mode'),
+      '#description' => $this->t('Glossary mode applies a limit to the number of characters used in the filter value, which allows the summary view to act as a glossary.'),
+      '#default_value' => $this->options['glossary'],
+      '#fieldset' => 'more',
+    );
+
+    $form['limit'] = array(
+      '#type' => 'textfield',
+      '#title' => $this->t('Character limit'),
+      '#description' => $this->t('How many characters of the filter value to filter against. If set to 1, all fields starting with the first letter in the filter value would be matched.'),
+      '#default_value' => $this->options['limit'],
+      '#states' => array(
+        'visible' => array(
+          ':input[name="options[glossary]"]' => array('checked' => TRUE),
+        ),
+      ),
+      '#fieldset' => 'more',
+    );
+
+    $form['case'] = array(
+      '#type' => 'select',
+      '#title' => $this->t('Case'),
+      '#description' => $this->t('When printing the title and summary, how to transform the case of the filter value.'),
+      '#options' => array(
+        'none' => $this->t('No transform'),
+        'upper' => $this->t('Upper case'),
+        'lower' => $this->t('Lower case'),
+        'ucfirst' => $this->t('Capitalize first letter'),
+        'ucwords' => $this->t('Capitalize each word'),
+      ),
+      '#default_value' => $this->options['case'],
+      '#fieldset' => 'more',
+    );
+
+    $form['path_case'] = array(
+      '#type' => 'select',
+      '#title' => $this->t('Case in path'),
+      '#description' => $this->t('When printing url paths, how to transform the case of the filter value. Do not use this unless with Postgres as it uses case sensitive comparisons.'),
+      '#options' => array(
+        'none' => $this->t('No transform'),
+        'upper' => $this->t('Upper case'),
+        'lower' => $this->t('Lower case'),
+        'ucfirst' => $this->t('Capitalize first letter'),
+        'ucwords' => $this->t('Capitalize each word'),
+      ),
+      '#default_value' => $this->options['path_case'],
+      '#fieldset' => 'more',
+    );
+
+    $form['transform_dash'] = array(
+      '#type' => 'checkbox',
+      '#title' => $this->t('Transform spaces to dashes in URL'),
+      '#default_value' => $this->options['transform_dash'],
+      '#fieldset' => 'more',
+    );
+
+    if (!empty($this->definition['many to one'])) {
+      $form['add_table'] = array(
+        '#type' => 'checkbox',
+        '#title' => $this->t('Allow multiple filter values to work together'),
+        '#description' => $this->t('If selected, multiple instances of this filter can work together, as though multiple values were supplied to the same filter. This setting is not compatible with the "Reduce duplicates" setting.'),
+        '#default_value' => !empty($this->options['add_table']),
+        '#fieldset' => 'more',
+      );
+
+      $form['require_value'] = array(
+        '#type' => 'checkbox',
+        '#title' => $this->t('Do not display items with no value in summary'),
+        '#default_value' => !empty($this->options['require_value']),
+        '#fieldset' => 'more',
+      );
+    }
+
+    // allow + for or, , for and
+    $form['break_phrase'] = array(
+      '#type' => 'checkbox',
+      '#title' => $this->t('Allow multiple values'),
+      '#description' => $this->t('If selected, users can enter multiple values in the form of 1+2+3 (for OR) or 1,2,3 (for AND).'),
+      '#default_value' => !empty($this->options['break_phrase']),
+      '#fieldset' => 'more',
+    );
+  }
+
+  /**
+   * Build the summary query based on a string
+   */
+  protected function summaryQuery() {
+    if (empty($this->definition['many to one'])) {
+      $this->ensureMyTable();
+    }
+    else {
+      $this->tableAlias = $this->helper->summaryJoin();
+    }
+
+    if (empty($this->options['glossary'])) {
+      // Add the field.
+      $this->base_alias = $this->query->addField($this->tableAlias, $this->realField);
+      $this->query->setCountField($this->tableAlias, $this->realField);
+    }
+    else {
+      // Add the field.
+      $formula = $this->getFormula();
+      $this->base_alias = $this->query->addField(NULL, $formula, $this->field . '_truncated');
+      $this->query->setCountField(NULL, $formula, $this->field, $this->field . '_truncated');
+    }
+
+    $this->summaryNameField();
+    return $this->summaryBasics(FALSE);
+  }
+
+  /**
+   * Get the formula for this argument.
+   *
+   * $this->ensureMyTable() MUST have been called prior to this.
+   */
+  public function getFormula() {
+    return "SUBSTRING($this->tableAlias.$this->realField, 1, " . intval($this->options['limit']) . ")";
+  }
+
+  /**
+   * Build the query based upon the formula
+   */
+  public function query($group_by = FALSE) {
+    $argument = $this->argument;
+    if (!empty($this->options['transform_dash'])) {
+      $argument = strtr($argument, '-', ' ');
+    }
+
+    if (!empty($this->options['break_phrase'])) {
+      $this->unpackArgumentValue();
+    }
+    else {
+      $this->value = array($argument);
+      $this->operator = 'or';
+    }
+
+    if (!empty($this->definition['many to one'])) {
+      if (!empty($this->options['glossary'])) {
+        $this->helper->formula = TRUE;
+      }
+      $this->helper->ensureMyTable();
+      $this->helper->addFilter();
+      return;
+    }
+
+    $this->ensureMyTable();
+    $formula = FALSE;
+    if (empty($this->options['glossary'])) {
+      $field = "$this->tableAlias.$this->realField";
+    }
+    else {
+      $formula = TRUE;
+      $field = $this->getFormula();
+    }
+
+    if (count($this->value) > 1) {
+      $operator = 'IN';
+      $argument = $this->value;
+    }
+    else {
+      $operator = '=';
+    }
+
+    if ($formula) {
+      $placeholder = $this->placeholder();
+      if ($operator == 'IN') {
+        $field .= " IN($placeholder)";
+      }
+      else {
+        $field .= ' = ' . $placeholder;
+      }
+      $placeholders = array(
+        $placeholder => $argument,
+      );
+      $this->query->addWhereExpression(0, $field, $placeholders);
+    }
+    else {
+      $this->query->addWhere(0, $field, $argument, $operator);
+    }
+  }
+
+  public function summaryArgument($data) {
+    $value = $this->caseTransform($data->{$this->base_alias}, $this->options['path_case']);
+    if (!empty($this->options['transform_dash'])) {
+      $value = strtr($value, ' ', '-');
+    }
+    return $value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getSortName() {
+    return $this->t('Alphabetical', array(), array('context' => 'Sort order'));
+  }
+
+  function title() {
+    $this->argument = $this->caseTransform($this->argument, $this->options['case']);
+    if (!empty($this->options['transform_dash'])) {
+      $this->argument = strtr($this->argument, '-', ' ');
+    }
+
+    if (!empty($this->options['break_phrase'])) {
+      $this->unpackArgumentValue();
+    }
+    else {
+      $this->value = array($this->argument);
+      $this->operator = 'or';
+    }
+
+    if (empty($this->value)) {
+      return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : $this->t('Uncategorized');
+    }
+
+    if ($this->value === array(-1)) {
+      return !empty($this->definition['invalid input']) ? $this->definition['invalid input'] : $this->t('Invalid input');
+    }
+
+    return implode($this->operator == 'or' ? ' + ' : ', ', $this->titleQuery());
+  }
+
+  /**
+   * Override for specific title lookups.
+   */
+  public function titleQuery() {
+    return array_map('\Drupal\Component\Utility\String::checkPlain', array_combine($this->value, $this->value));
+  }
+
+  public function summaryName($data) {
+    return $this->caseTransform(parent::summaryName($data), $this->options['case']);
+  }
+
+}
diff --git a/core/modules/views/src/Plugin/views/argument_validator/Numeric.php b/core/modules/views/src/Plugin/views/argument_validator/Numeric.php
deleted file mode 100644
index ff7e5a3..0000000
--- a/core/modules/views/src/Plugin/views/argument_validator/Numeric.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\views\Plugin\views\argument_validator\Numeric.
- */
-
-namespace Drupal\views\Plugin\views\argument_validator;
-
-/**
- * Validate whether an argument is numeric or not.
- *
- * @ingroup views_argument_validate_plugins
- *
- * @ViewsArgumentValidator(
- *   id = "numeric",
- *   title = @Translation("Numeric")
- * )
- */
-class Numeric extends ArgumentValidatorPluginBase {
-
-  public function validateArgument($argument) {
-    return is_numeric($argument);
-  }
-
-}
diff --git a/core/modules/views/src/Plugin/views/argument_validator/NumericArgumentValidator.php b/core/modules/views/src/Plugin/views/argument_validator/NumericArgumentValidator.php
new file mode 100644
index 0000000..668411e
--- /dev/null
+++ b/core/modules/views/src/Plugin/views/argument_validator/NumericArgumentValidator.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\views\Plugin\views\argument_validator\Numeric.
+ */
+
+namespace Drupal\views\Plugin\views\argument_validator;
+
+/**
+ * Validate whether an argument is numeric or not.
+ *
+ * @ingroup views_argument_validate_plugins
+ *
+ * @ViewsArgumentValidator(
+ *   id = "numeric",
+ *   title = @Translation("Numeric")
+ * )
+ */
+class NumericArgumentValidator extends ArgumentValidatorPluginBase {
+
+  public function validateArgument($argument) {
+    return is_numeric($argument);
+  }
+
+}
diff --git a/core/modules/views/src/Plugin/views/field/Numeric.php b/core/modules/views/src/Plugin/views/field/Numeric.php
deleted file mode 100644
index da99d15..0000000
--- a/core/modules/views/src/Plugin/views/field/Numeric.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\views\Plugin\views\field\Numeric.
- */
-
-namespace Drupal\views\Plugin\views\field;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\ResultRow;
-
-/**
- * Render a field as a numeric value
- *
- * Definition terms:
- * - float: If true this field contains a decimal value. If unset this field
- *          will be assumed to be integer.
- *
- * @ingroup views_field_handlers
- *
- * @ViewsField("numeric")
- */
-class Numeric extends FieldPluginBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-
-    $options['set_precision'] = array('default' => FALSE);
-    $options['precision'] = array('default' => 0);
-    $options['decimal'] = array('default' => '.');
-    $options['separator'] = array('default' => ',');
-    $options['format_plural'] = array('default' => FALSE);
-    $options['format_plural_singular'] = array('default' => '1');
-    $options['format_plural_plural'] = array('default' => '@count');
-    $options['prefix'] = array('default' => '');
-    $options['suffix'] = array('default' => '');
-
-    return $options;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    if (!empty($this->definition['float'])) {
-      $form['set_precision'] = array(
-        '#type' => 'checkbox',
-        '#title' => $this->t('Round'),
-        '#description' => $this->t('If checked, the number will be rounded.'),
-        '#default_value' => $this->options['set_precision'],
-      );
-      $form['precision'] = array(
-        '#type' => 'textfield',
-        '#title' => $this->t('Precision'),
-        '#default_value' => $this->options['precision'],
-        '#description' => $this->t('Specify how many digits to print after the decimal point.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[set_precision]"]' => array('checked' => TRUE),
-          ),
-        ),
-        '#size' => 2,
-      );
-      $form['decimal'] = array(
-        '#type' => 'textfield',
-        '#title' => $this->t('Decimal point'),
-        '#default_value' => $this->options['decimal'],
-        '#description' => $this->t('What single character to use as a decimal point.'),
-        '#size' => 2,
-      );
-    }
-    $form['separator'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Thousands marker'),
-      '#options' => array(
-        '' => $this->t('- None -'),
-        ',' => $this->t('Comma'),
-        ' ' => $this->t('Space'),
-        '.' => $this->t('Decimal'),
-        '\'' => $this->t('Apostrophe'),
-      ),
-      '#default_value' => $this->options['separator'],
-      '#description' => $this->t('What single character to use as the thousands separator.'),
-      '#size' => 2,
-    );
-    $form['format_plural'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Format plural'),
-      '#description' => $this->t('If checked, special handling will be used for plurality.'),
-      '#default_value' => $this->options['format_plural'],
-    );
-    $form['format_plural_singular'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Singular form'),
-      '#default_value' => $this->options['format_plural_singular'],
-      '#description' => $this->t('Text to use for the singular form.'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[format_plural]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
-    $form['format_plural_plural'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Plural form'),
-      '#default_value' => $this->options['format_plural_plural'],
-      '#description' => $this->t('Text to use for the plural form, @count will be replaced with the value.'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[format_plural]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
-    $form['prefix'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Prefix'),
-      '#default_value' => $this->options['prefix'],
-      '#description' => $this->t('Text to put before the number, such as currency symbol.'),
-    );
-    $form['suffix'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Suffix'),
-      '#default_value' => $this->options['suffix'],
-      '#description' => $this->t('Text to put after the number, such as currency symbol.'),
-    );
-
-    parent::buildOptionsForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function render(ResultRow $values) {
-    $value = $this->getValue($values);
-    if (!empty($this->options['set_precision'])) {
-      $value = number_format($value, $this->options['precision'], $this->options['decimal'], $this->options['separator']);
-    }
-    else {
-      $remainder = abs($value) - intval(abs($value));
-      $value = $value > 0 ? floor($value) : ceil($value);
-      $value = number_format($value, 0, '', $this->options['separator']);
-      if ($remainder) {
-        // The substr may not be locale safe.
-        $value .= $this->options['decimal'] . substr($remainder, 2);
-      }
-    }
-
-    // Check to see if hiding should happen before adding prefix and suffix.
-    if ($this->options['hide_empty'] && empty($value) && ($value !== 0 || $this->options['empty_zero'])) {
-      return '';
-    }
-
-    // Should we format as a plural.
-    if (!empty($this->options['format_plural'])) {
-      $value = $this->formatPlural($value, $this->options['format_plural_singular'], $this->options['format_plural_plural']);
-    }
-
-    return $this->sanitizeValue($this->options['prefix'], 'xss')
-      . $this->sanitizeValue($value)
-      . $this->sanitizeValue($this->options['suffix'], 'xss');
-  }
-
-}
diff --git a/core/modules/views/src/Plugin/views/field/NumericField.php b/core/modules/views/src/Plugin/views/field/NumericField.php
new file mode 100644
index 0000000..f9f56aa
--- /dev/null
+++ b/core/modules/views/src/Plugin/views/field/NumericField.php
@@ -0,0 +1,167 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\views\Plugin\views\field\Numeric.
+ */
+
+namespace Drupal\views\Plugin\views\field;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\views\ResultRow;
+
+/**
+ * Render a field as a numeric value
+ *
+ * Definition terms:
+ * - float: If true this field contains a decimal value. If unset this field
+ *          will be assumed to be integer.
+ *
+ * @ingroup views_field_handlers
+ *
+ * @ViewsField("numeric")
+ */
+class NumericField extends FieldPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function defineOptions() {
+    $options = parent::defineOptions();
+
+    $options['set_precision'] = array('default' => FALSE);
+    $options['precision'] = array('default' => 0);
+    $options['decimal'] = array('default' => '.');
+    $options['separator'] = array('default' => ',');
+    $options['format_plural'] = array('default' => FALSE);
+    $options['format_plural_singular'] = array('default' => '1');
+    $options['format_plural_plural'] = array('default' => '@count');
+    $options['prefix'] = array('default' => '');
+    $options['suffix'] = array('default' => '');
+
+    return $options;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
+    if (!empty($this->definition['float'])) {
+      $form['set_precision'] = array(
+        '#type' => 'checkbox',
+        '#title' => $this->t('Round'),
+        '#description' => $this->t('If checked, the number will be rounded.'),
+        '#default_value' => $this->options['set_precision'],
+      );
+      $form['precision'] = array(
+        '#type' => 'textfield',
+        '#title' => $this->t('Precision'),
+        '#default_value' => $this->options['precision'],
+        '#description' => $this->t('Specify how many digits to print after the decimal point.'),
+        '#states' => array(
+          'visible' => array(
+            ':input[name="options[set_precision]"]' => array('checked' => TRUE),
+          ),
+        ),
+        '#size' => 2,
+      );
+      $form['decimal'] = array(
+        '#type' => 'textfield',
+        '#title' => $this->t('Decimal point'),
+        '#default_value' => $this->options['decimal'],
+        '#description' => $this->t('What single character to use as a decimal point.'),
+        '#size' => 2,
+      );
+    }
+    $form['separator'] = array(
+      '#type' => 'select',
+      '#title' => $this->t('Thousands marker'),
+      '#options' => array(
+        '' => $this->t('- None -'),
+        ',' => $this->t('Comma'),
+        ' ' => $this->t('Space'),
+        '.' => $this->t('Decimal'),
+        '\'' => $this->t('Apostrophe'),
+      ),
+      '#default_value' => $this->options['separator'],
+      '#description' => $this->t('What single character to use as the thousands separator.'),
+      '#size' => 2,
+    );
+    $form['format_plural'] = array(
+      '#type' => 'checkbox',
+      '#title' => $this->t('Format plural'),
+      '#description' => $this->t('If checked, special handling will be used for plurality.'),
+      '#default_value' => $this->options['format_plural'],
+    );
+    $form['format_plural_singular'] = array(
+      '#type' => 'textfield',
+      '#title' => $this->t('Singular form'),
+      '#default_value' => $this->options['format_plural_singular'],
+      '#description' => $this->t('Text to use for the singular form.'),
+      '#states' => array(
+        'visible' => array(
+          ':input[name="options[format_plural]"]' => array('checked' => TRUE),
+        ),
+      ),
+    );
+    $form['format_plural_plural'] = array(
+      '#type' => 'textfield',
+      '#title' => $this->t('Plural form'),
+      '#default_value' => $this->options['format_plural_plural'],
+      '#description' => $this->t('Text to use for the plural form, @count will be replaced with the value.'),
+      '#states' => array(
+        'visible' => array(
+          ':input[name="options[format_plural]"]' => array('checked' => TRUE),
+        ),
+      ),
+    );
+    $form['prefix'] = array(
+      '#type' => 'textfield',
+      '#title' => $this->t('Prefix'),
+      '#default_value' => $this->options['prefix'],
+      '#description' => $this->t('Text to put before the number, such as currency symbol.'),
+    );
+    $form['suffix'] = array(
+      '#type' => 'textfield',
+      '#title' => $this->t('Suffix'),
+      '#default_value' => $this->options['suffix'],
+      '#description' => $this->t('Text to put after the number, such as currency symbol.'),
+    );
+
+    parent::buildOptionsForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function render(ResultRow $values) {
+    $value = $this->getValue($values);
+    if (!empty($this->options['set_precision'])) {
+      $value = number_format($value, $this->options['precision'], $this->options['decimal'], $this->options['separator']);
+    }
+    else {
+      $remainder = abs($value) - intval(abs($value));
+      $value = $value > 0 ? floor($value) : ceil($value);
+      $value = number_format($value, 0, '', $this->options['separator']);
+      if ($remainder) {
+        // The substr may not be locale safe.
+        $value .= $this->options['decimal'] . substr($remainder, 2);
+      }
+    }
+
+    // Check to see if hiding should happen before adding prefix and suffix.
+    if ($this->options['hide_empty'] && empty($value) && ($value !== 0 || $this->options['empty_zero'])) {
+      return '';
+    }
+
+    // Should we format as a plural.
+    if (!empty($this->options['format_plural'])) {
+      $value = $this->formatPlural($value, $this->options['format_plural_singular'], $this->options['format_plural_plural']);
+    }
+
+    return $this->sanitizeValue($this->options['prefix'], 'xss')
+      . $this->sanitizeValue($value)
+      . $this->sanitizeValue($this->options['suffix'], 'xss');
+  }
+
+}
diff --git a/core/modules/views/src/Plugin/views/filter/Date.php b/core/modules/views/src/Plugin/views/filter/Date.php
index 7e5417f..0da9300 100644
--- a/core/modules/views/src/Plugin/views/filter/Date.php
+++ b/core/modules/views/src/Plugin/views/filter/Date.php
@@ -16,7 +16,7 @@
  *
  * @ViewsFilter("date")
  */
-class Date extends Numeric {
+class Date extends NumericFilter {
 
   protected function defineOptions() {
     $options = parent::defineOptions();
diff --git a/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php b/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php
index 9bd321b..e7157a9 100644
--- a/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php
+++ b/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php
@@ -14,7 +14,7 @@
  *
  * @ViewsFilter("groupby_numeric")
  */
-class GroupByNumeric extends Numeric {
+class GroupByNumeric extends NumericFilter {
 
   public function query() {
     $this->ensureMyTable();
diff --git a/core/modules/views/src/Plugin/views/filter/Numeric.php b/core/modules/views/src/Plugin/views/filter/Numeric.php
deleted file mode 100644
index 38c0fca..0000000
--- a/core/modules/views/src/Plugin/views/filter/Numeric.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\views\Plugin\views\filter\Numeric.
- */
-
-namespace Drupal\views\Plugin\views\filter;
-
-use Drupal\Component\Utility\String as UtilityString;
-use Drupal\Core\Database\Database;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Simple filter to handle greater than/less than filters
- *
- * @ingroup views_filter_handlers
- *
- * @ViewsFilter("numeric")
- */
-class Numeric extends FilterPluginBase {
-
-  protected $alwaysMultiple = TRUE;
-
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-
-    $options['value'] = array(
-      'contains' => array(
-        'min' => array('default' => ''),
-        'max' => array('default' => ''),
-        'value' => array('default' => ''),
-      ),
-    );
-
-    return $options;
-  }
-
-  function operators() {
-    $operators = array(
-      '<' => array(
-        'title' => $this->t('Is less than'),
-        'method' => 'opSimple',
-        'short' => $this->t('<'),
-        'values' => 1,
-      ),
-      '<=' => array(
-        'title' => $this->t('Is less than or equal to'),
-        'method' => 'opSimple',
-        'short' => $this->t('<='),
-        'values' => 1,
-      ),
-      '=' => array(
-        'title' => $this->t('Is equal to'),
-        'method' => 'opSimple',
-        'short' => $this->t('='),
-        'values' => 1,
-      ),
-      '!=' => array(
-        'title' => $this->t('Is not equal to'),
-        'method' => 'opSimple',
-        'short' => $this->t('!='),
-        'values' => 1,
-      ),
-      '>=' => array(
-        'title' => $this->t('Is greater than or equal to'),
-        'method' => 'opSimple',
-        'short' => $this->t('>='),
-        'values' => 1,
-      ),
-      '>' => array(
-        'title' => $this->t('Is greater than'),
-        'method' => 'opSimple',
-        'short' => $this->t('>'),
-        'values' => 1,
-      ),
-      'between' => array(
-        'title' => $this->t('Is between'),
-        'method' => 'opBetween',
-        'short' => $this->t('between'),
-        'values' => 2,
-      ),
-      'not between' => array(
-        'title' => $this->t('Is not between'),
-        'method' => 'opBetween',
-        'short' => $this->t('not between'),
-        'values' => 2,
-      ),
-      'regular_expression' => array(
-        'title' => $this->t('Regular expression'),
-        'short' => $this->t('regex'),
-        'method' => 'op_regex',
-        'values' => 1,
-      ),
-    );
-
-    // if the definition allows for the empty operator, add it.
-    if (!empty($this->definition['allow empty'])) {
-      $operators += array(
-        'empty' => array(
-          'title' => $this->t('Is empty (NULL)'),
-          'method' => 'opEmpty',
-          'short' => $this->t('empty'),
-          'values' => 0,
-        ),
-        'not empty' => array(
-          'title' => $this->t('Is not empty (NOT NULL)'),
-          'method' => 'opEmpty',
-          'short' => $this->t('not empty'),
-          'values' => 0,
-        ),
-      );
-    }
-
-    return $operators;
-  }
-
-  /**
-   * Provide a list of all the numeric operators
-   */
-  public function operatorOptions($which = 'title') {
-    $options = array();
-    foreach ($this->operators() as $id => $info) {
-      $options[$id] = $info[$which];
-    }
-
-    return $options;
-  }
-
-  protected function operatorValues($values = 1) {
-    $options = array();
-    foreach ($this->operators() as $id => $info) {
-      if ($info['values'] == $values) {
-        $options[] = $id;
-      }
-    }
-
-    return $options;
-  }
-  /**
-   * Provide a simple textfield for equality
-   */
-  protected function valueForm(&$form, FormStateInterface $form_state) {
-    $form['value']['#tree'] = TRUE;
-
-    // We have to make some choices when creating this as an exposed
-    // filter form. For example, if the operator is locked and thus
-    // not rendered, we can't render dependencies; instead we only
-    // render the form items we need.
-    $which = 'all';
-    if (!empty($form['operator'])) {
-      $source = ':input[name="options[operator]"]';
-    }
-
-    if ($exposed = $form_state->get('exposed')) {
-      $identifier = $this->options['expose']['identifier'];
-
-      if (empty($this->options['expose']['use_operator']) || empty($this->options['expose']['operator_id'])) {
-        // exposed and locked.
-        $which = in_array($this->operator, $this->operatorValues(2)) ? 'minmax' : 'value';
-      }
-      else {
-        $source = ':input[name="' . $this->options['expose']['operator_id'] . '"]';
-      }
-    }
-
-    $user_input = $form_state->getUserInput();
-    if ($which == 'all') {
-      $form['value']['value'] = array(
-        '#type' => 'textfield',
-        '#title' => !$exposed ? $this->t('Value') : '',
-        '#size' => 30,
-        '#default_value' => $this->value['value'],
-      );
-      // Setup #states for all operators with one value.
-      foreach ($this->operatorValues(1) as $operator) {
-        $form['value']['value']['#states']['visible'][] = array(
-          $source => array('value' => $operator),
-        );
-      }
-      if ($exposed && !isset($user_input[$identifier]['value'])) {
-        $user_input[$identifier]['value'] = $this->value['value'];
-        $form_state->setUserInput($user_input);
-      }
-    }
-    elseif ($which == 'value') {
-      // When exposed we drop the value-value and just do value if
-      // the operator is locked.
-      $form['value'] = array(
-        '#type' => 'textfield',
-        '#title' => !$exposed ? $this->t('Value') : '',
-        '#size' => 30,
-        '#default_value' => $this->value['value'],
-      );
-      if ($exposed && !isset($user_input[$identifier])) {
-        $user_input[$identifier] = $this->value['value'];
-        $form_state->setUserInput($user_input);
-      }
-    }
-
-    if ($which == 'all' || $which == 'minmax') {
-      $form['value']['min'] = array(
-        '#type' => 'textfield',
-        '#title' => !$exposed ? $this->t('Min') : '',
-        '#size' => 30,
-        '#default_value' => $this->value['min'],
-      );
-      $form['value']['max'] = array(
-        '#type' => 'textfield',
-        '#title' => !$exposed ? $this->t('And max') : $this->t('And'),
-        '#size' => 30,
-        '#default_value' => $this->value['max'],
-      );
-      if ($which == 'all') {
-        $states = array();
-        // Setup #states for all operators with two values.
-        foreach ($this->operatorValues(2) as $operator) {
-          $states['#states']['visible'][] = array(
-            $source => array('value' => $operator),
-          );
-        }
-        $form['value']['min'] += $states;
-        $form['value']['max'] += $states;
-      }
-      if ($exposed && !isset($user_input[$identifier]['min'])) {
-        $user_input[$identifier]['min'] = $this->value['min'];
-      }
-      if ($exposed && !isset($user_input[$identifier]['max'])) {
-        $user_input[$identifier]['max'] = $this->value['max'];
-      }
-
-      if (!isset($form['value'])) {
-        // Ensure there is something in the 'value'.
-        $form['value'] = array(
-          '#type' => 'value',
-          '#value' => NULL
-        );
-      }
-    }
-  }
-
-  public function query() {
-    $this->ensureMyTable();
-    $field = "$this->tableAlias.$this->realField";
-
-    $info = $this->operators();
-    if (!empty($info[$this->operator]['method'])) {
-      $this->{$info[$this->operator]['method']}($field);
-    }
-  }
-
-  protected function opBetween($field) {
-    if ($this->operator == 'between') {
-      $this->query->addWhere($this->options['group'], $field, array($this->value['min'], $this->value['max']), 'BETWEEN');
-    }
-    else {
-      $this->query->addWhere($this->options['group'], db_or()->condition($field, $this->value['min'], '<=')->condition($field, $this->value['max'], '>='));
-    }
-  }
-
-  protected function opSimple($field) {
-    $this->query->addWhere($this->options['group'], $field, $this->value['value'], $this->operator);
-  }
-
-  protected function opEmpty($field) {
-    if ($this->operator == 'empty') {
-      $operator = "IS NULL";
-    }
-    else {
-      $operator = "IS NOT NULL";
-    }
-
-    $this->query->addWhere($this->options['group'], $field, NULL, $operator);
-  }
-
-  /**
-   * Filters by a regular expression.
-   *
-   * @param string $field
-   *   The expression pointing to the queries field, for example "foo.bar".
-   */
-  protected function opRegex($field) {
-    $this->query->addWhere($this->options['group'], $field, $this->value, 'REGEXP');
-  }
-
-  public function adminSummary() {
-    if ($this->isAGroup()) {
-      return $this->t('grouped');
-    }
-    if (!empty($this->options['exposed'])) {
-      return $this->t('exposed');
-    }
-
-    $options = $this->operatorOptions('short');
-    $output = UtilityString::checkPlain($options[$this->operator]);
-    if (in_array($this->operator, $this->operatorValues(2))) {
-      $output .= ' ' . $this->t('@min and @max', array('@min' => $this->value['min'], '@max' => $this->value['max']));
-    }
-    elseif (in_array($this->operator, $this->operatorValues(1))) {
-      $output .= ' ' . UtilityString::checkPlain($this->value['value']);
-    }
-    return $output;
-  }
-
-  /**
-   * Do some minor translation of the exposed input
-   */
-  public function acceptExposedInput($input) {
-    if (empty($this->options['exposed'])) {
-      return TRUE;
-    }
-
-    // rewrite the input value so that it's in the correct format so that
-    // the parent gets the right data.
-    if (!empty($this->options['expose']['identifier'])) {
-      $value = &$input[$this->options['expose']['identifier']];
-      if (!is_array($value)) {
-        $value = array(
-          'value' => $value,
-        );
-      }
-    }
-
-    $rc = parent::acceptExposedInput($input);
-
-    if (empty($this->options['expose']['required'])) {
-      // We have to do some of our own checking for non-required filters.
-      $info = $this->operators();
-      if (!empty($info[$this->operator]['values'])) {
-        switch ($info[$this->operator]['values']) {
-          case 1:
-            if ($value['value'] === '') {
-              return FALSE;
-            }
-            break;
-          case 2:
-            if ($value['min'] === '' && $value['max'] === '') {
-              return FALSE;
-            }
-            break;
-        }
-      }
-    }
-
-    return $rc;
-  }
-
-}
diff --git a/core/modules/views/src/Plugin/views/filter/NumericFilter.php b/core/modules/views/src/Plugin/views/filter/NumericFilter.php
new file mode 100644
index 0000000..54b2523
--- /dev/null
+++ b/core/modules/views/src/Plugin/views/filter/NumericFilter.php
@@ -0,0 +1,348 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\views\Plugin\views\filter\Numeric.
+ */
+
+namespace Drupal\views\Plugin\views\filter;
+
+use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Simple filter to handle greater than/less than filters
+ *
+ * @ingroup views_filter_handlers
+ *
+ * @ViewsFilter("numeric")
+ */
+class NumericFilter extends FilterPluginBase {
+
+  protected $alwaysMultiple = TRUE;
+
+  protected function defineOptions() {
+    $options = parent::defineOptions();
+
+    $options['value'] = array(
+      'contains' => array(
+        'min' => array('default' => ''),
+        'max' => array('default' => ''),
+        'value' => array('default' => ''),
+      ),
+    );
+
+    return $options;
+  }
+
+  function operators() {
+    $operators = array(
+      '<' => array(
+        'title' => $this->t('Is less than'),
+        'method' => 'opSimple',
+        'short' => $this->t('<'),
+        'values' => 1,
+      ),
+      '<=' => array(
+        'title' => $this->t('Is less than or equal to'),
+        'method' => 'opSimple',
+        'short' => $this->t('<='),
+        'values' => 1,
+      ),
+      '=' => array(
+        'title' => $this->t('Is equal to'),
+        'method' => 'opSimple',
+        'short' => $this->t('='),
+        'values' => 1,
+      ),
+      '!=' => array(
+        'title' => $this->t('Is not equal to'),
+        'method' => 'opSimple',
+        'short' => $this->t('!='),
+        'values' => 1,
+      ),
+      '>=' => array(
+        'title' => $this->t('Is greater than or equal to'),
+        'method' => 'opSimple',
+        'short' => $this->t('>='),
+        'values' => 1,
+      ),
+      '>' => array(
+        'title' => $this->t('Is greater than'),
+        'method' => 'opSimple',
+        'short' => $this->t('>'),
+        'values' => 1,
+      ),
+      'between' => array(
+        'title' => $this->t('Is between'),
+        'method' => 'opBetween',
+        'short' => $this->t('between'),
+        'values' => 2,
+      ),
+      'not between' => array(
+        'title' => $this->t('Is not between'),
+        'method' => 'opBetween',
+        'short' => $this->t('not between'),
+        'values' => 2,
+      ),
+      'regular_expression' => array(
+        'title' => $this->t('Regular expression'),
+        'short' => $this->t('regex'),
+        'method' => 'op_regex',
+        'values' => 1,
+      ),
+    );
+
+    // if the definition allows for the empty operator, add it.
+    if (!empty($this->definition['allow empty'])) {
+      $operators += array(
+        'empty' => array(
+          'title' => $this->t('Is empty (NULL)'),
+          'method' => 'opEmpty',
+          'short' => $this->t('empty'),
+          'values' => 0,
+        ),
+        'not empty' => array(
+          'title' => $this->t('Is not empty (NOT NULL)'),
+          'method' => 'opEmpty',
+          'short' => $this->t('not empty'),
+          'values' => 0,
+        ),
+      );
+    }
+
+    return $operators;
+  }
+
+  /**
+   * Provide a list of all the numeric operators
+   */
+  public function operatorOptions($which = 'title') {
+    $options = array();
+    foreach ($this->operators() as $id => $info) {
+      $options[$id] = $info[$which];
+    }
+
+    return $options;
+  }
+
+  protected function operatorValues($values = 1) {
+    $options = array();
+    foreach ($this->operators() as $id => $info) {
+      if ($info['values'] == $values) {
+        $options[] = $id;
+      }
+    }
+
+    return $options;
+  }
+  /**
+   * Provide a simple textfield for equality
+   */
+  protected function valueForm(&$form, FormStateInterface $form_state) {
+    $form['value']['#tree'] = TRUE;
+
+    // We have to make some choices when creating this as an exposed
+    // filter form. For example, if the operator is locked and thus
+    // not rendered, we can't render dependencies; instead we only
+    // render the form items we need.
+    $which = 'all';
+    if (!empty($form['operator'])) {
+      $source = ':input[name="options[operator]"]';
+    }
+
+    if ($exposed = $form_state->get('exposed')) {
+      $identifier = $this->options['expose']['identifier'];
+
+      if (empty($this->options['expose']['use_operator']) || empty($this->options['expose']['operator_id'])) {
+        // exposed and locked.
+        $which = in_array($this->operator, $this->operatorValues(2)) ? 'minmax' : 'value';
+      }
+      else {
+        $source = ':input[name="' . $this->options['expose']['operator_id'] . '"]';
+      }
+    }
+
+    $user_input = $form_state->getUserInput();
+    if ($which == 'all') {
+      $form['value']['value'] = array(
+        '#type' => 'textfield',
+        '#title' => !$exposed ? $this->t('Value') : '',
+        '#size' => 30,
+        '#default_value' => $this->value['value'],
+      );
+      // Setup #states for all operators with one value.
+      foreach ($this->operatorValues(1) as $operator) {
+        $form['value']['value']['#states']['visible'][] = array(
+          $source => array('value' => $operator),
+        );
+      }
+      if ($exposed && !isset($user_input[$identifier]['value'])) {
+        $user_input[$identifier]['value'] = $this->value['value'];
+        $form_state->setUserInput($user_input);
+      }
+    }
+    elseif ($which == 'value') {
+      // When exposed we drop the value-value and just do value if
+      // the operator is locked.
+      $form['value'] = array(
+        '#type' => 'textfield',
+        '#title' => !$exposed ? $this->t('Value') : '',
+        '#size' => 30,
+        '#default_value' => $this->value['value'],
+      );
+      if ($exposed && !isset($user_input[$identifier])) {
+        $user_input[$identifier] = $this->value['value'];
+        $form_state->setUserInput($user_input);
+      }
+    }
+
+    if ($which == 'all' || $which == 'minmax') {
+      $form['value']['min'] = array(
+        '#type' => 'textfield',
+        '#title' => !$exposed ? $this->t('Min') : '',
+        '#size' => 30,
+        '#default_value' => $this->value['min'],
+      );
+      $form['value']['max'] = array(
+        '#type' => 'textfield',
+        '#title' => !$exposed ? $this->t('And max') : $this->t('And'),
+        '#size' => 30,
+        '#default_value' => $this->value['max'],
+      );
+      if ($which == 'all') {
+        $states = array();
+        // Setup #states for all operators with two values.
+        foreach ($this->operatorValues(2) as $operator) {
+          $states['#states']['visible'][] = array(
+            $source => array('value' => $operator),
+          );
+        }
+        $form['value']['min'] += $states;
+        $form['value']['max'] += $states;
+      }
+      if ($exposed && !isset($user_input[$identifier]['min'])) {
+        $user_input[$identifier]['min'] = $this->value['min'];
+      }
+      if ($exposed && !isset($user_input[$identifier]['max'])) {
+        $user_input[$identifier]['max'] = $this->value['max'];
+      }
+
+      if (!isset($form['value'])) {
+        // Ensure there is something in the 'value'.
+        $form['value'] = array(
+          '#type' => 'value',
+          '#value' => NULL
+        );
+      }
+    }
+  }
+
+  public function query() {
+    $this->ensureMyTable();
+    $field = "$this->tableAlias.$this->realField";
+
+    $info = $this->operators();
+    if (!empty($info[$this->operator]['method'])) {
+      $this->{$info[$this->operator]['method']}($field);
+    }
+  }
+
+  protected function opBetween($field) {
+    if ($this->operator == 'between') {
+      $this->query->addWhere($this->options['group'], $field, array($this->value['min'], $this->value['max']), 'BETWEEN');
+    }
+    else {
+      $this->query->addWhere($this->options['group'], db_or()->condition($field, $this->value['min'], '<=')->condition($field, $this->value['max'], '>='));
+    }
+  }
+
+  protected function opSimple($field) {
+    $this->query->addWhere($this->options['group'], $field, $this->value['value'], $this->operator);
+  }
+
+  protected function opEmpty($field) {
+    if ($this->operator == 'empty') {
+      $operator = "IS NULL";
+    }
+    else {
+      $operator = "IS NOT NULL";
+    }
+
+    $this->query->addWhere($this->options['group'], $field, NULL, $operator);
+  }
+
+  /**
+   * Filters by a regular expression.
+   *
+   * @param string $field
+   *   The expression pointing to the queries field, for example "foo.bar".
+   */
+  protected function opRegex($field) {
+    $this->query->addWhere($this->options['group'], $field, $this->value, 'REGEXP');
+  }
+
+  public function adminSummary() {
+    if ($this->isAGroup()) {
+      return $this->t('grouped');
+    }
+    if (!empty($this->options['exposed'])) {
+      return $this->t('exposed');
+    }
+
+    $options = $this->operatorOptions('short');
+    $output = UtilityString::checkPlain($options[$this->operator]);
+    if (in_array($this->operator, $this->operatorValues(2))) {
+      $output .= ' ' . $this->t('@min and @max', array('@min' => $this->value['min'], '@max' => $this->value['max']));
+    }
+    elseif (in_array($this->operator, $this->operatorValues(1))) {
+      $output .= ' ' . UtilityString::checkPlain($this->value['value']);
+    }
+    return $output;
+  }
+
+  /**
+   * Do some minor translation of the exposed input
+   */
+  public function acceptExposedInput($input) {
+    if (empty($this->options['exposed'])) {
+      return TRUE;
+    }
+
+    // rewrite the input value so that it's in the correct format so that
+    // the parent gets the right data.
+    if (!empty($this->options['expose']['identifier'])) {
+      $value = &$input[$this->options['expose']['identifier']];
+      if (!is_array($value)) {
+        $value = array(
+          'value' => $value,
+        );
+      }
+    }
+
+    $rc = parent::acceptExposedInput($input);
+
+    if (empty($this->options['expose']['required'])) {
+      // We have to do some of our own checking for non-required filters.
+      $info = $this->operators();
+      if (!empty($info[$this->operator]['values'])) {
+        switch ($info[$this->operator]['values']) {
+          case 1:
+            if ($value['value'] === '') {
+              return FALSE;
+            }
+            break;
+          case 2:
+            if ($value['min'] === '' && $value['max'] === '') {
+              return FALSE;
+            }
+            break;
+        }
+      }
+    }
+
+    return $rc;
+  }
+
+}
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php
index 6d221ae..ec0ac1a 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\views_test_data\Plugin\views\style;
 
 use Drupal\views\Plugin\views\style\Mapping;
-use Drupal\views\Plugin\views\field\Numeric;
+use Drupal\views\Plugin\views\field\NumericField;
 
 /**
  * Provides a test plugin for the mapping style.
@@ -59,7 +59,7 @@ protected function defineMapping() {
    */
   protected function filterNumericFields(&$fields) {
     foreach ($this->view->field as $id => $field) {
-      if (!($field instanceof Numeric)) {
+      if (!($field instanceof NumericField)) {
         unset($fields[$id]);
       }
     }
