diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php
index b5ab713..651994e 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php
@@ -102,21 +102,14 @@ public function query($group_by = FALSE) {
     $this->ensureMyTable();
 
     if (!empty($this->options['break_phrase'])) {
-      $tids = new \stdClass();
-      $tids->value = $this->argument;
-      $tids = $this->breakPhrase($this->argument, $tids);
-      if ($tids->value == array(-1)) {
+      $breakPhrase = HandlerBase::breakPhrase($this->argument);
+      if ($breakPhrase['value'] === array(-1)) {
         return FALSE;
       }
 
-      if (count($tids->value) > 1) {
-        $operator = 'IN';
-      }
-      else {
-        $operator = '=';
-      }
+      $operator = (count($breakPhrase['value']) > 1) ? 'IN' : '=';
 
-      $tids = $tids->value;
+      $tids = $breakPhrase['value'];
     }
     else {
       $operator = "=";
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
index e67614e..19ede68 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
@@ -814,117 +814,47 @@ public static function getTableJoin($table, $base_table) {
   }
 
   /**
-   * Breaks x,y,z and x+y+z into an array. Numeric only.
+   * Explodes x,y,z and x+y+z to be used as views filter argument.
    *
    * @param string $str
-   *   The string to parse.
-   * @param Drupal\views\Plugin\views\HandlerBase|null $handler
-   *   The handler object to use as a base. If not specified one will
-   *   be created.
+   *   The string to split.
    *
-   * @return Drupal\views\Plugin\views\HandlerBase|stdClass $handler
-   *   The new handler object.
-   */
-  public static function breakPhrase($str, &$handler = NULL) {
-    if (!$handler) {
-      $handler = new \stdClass();
-    }
-
-    // Set up defaults:
-
-    if (!isset($handler->value)) {
-      $handler->value = array();
-    }
-
-    if (!isset($handler->operator)) {
-      $handler->operator = 'or';
-    }
-
-    if (empty($str)) {
-      return $handler;
-    }
-
-    if (preg_match('/^([0-9]+[+ ])+[0-9]+$/', $str)) {
-      // The '+' character in a query string may be parsed as ' '.
-      $handler->operator = 'or';
-      $handler->value = preg_split('/[+ ]/', $str);
-    }
-    elseif (preg_match('/^([0-9]+,)*[0-9]+$/', $str)) {
-      $handler->operator = 'and';
-      $handler->value = explode(',', $str);
-    }
-
-    // Keep an 'error' value if invalid strings were given.
-    if (!empty($str) && (empty($handler->value) || !is_array($handler->value))) {
-      $handler->value = array(-1);
-      return $handler;
-    }
-
-    // Doubly ensure that all values are numeric only.
-    foreach ($handler->value as $id => $value) {
-      $handler->value[$id] = intval($value);
-    }
-
-    return $handler;
-  }
-
-  /**
-   * Breaks x,y,z and x+y+z into an array. Works for strings.
+   * @param bool $force_int
+   *   Enforce a numeric check.
    *
-   * @param string $str
-   *   The string to parse.
-   * @param Drupal\views\Plugin\views\HandlerBase|null $handler
-   *   The object to use as a base. If not specified one will
-   *   be created.
-   *
-   * @return Drupal\views\Plugin\views\HandlerBase|stdClass $handler
-   *   The new handler object.
+   * @return array $return
+   *   An array containing the exploded values as array and "and" or "or" as
+   *   operator.
    */
-  public static function breakPhraseString($str, &$handler = NULL) {
-    if (!$handler) {
-      $handler = new \stdClass();
-    }
-
-    // Set up defaults:
-    if (!isset($handler->value)) {
-      $handler->value = array();
-    }
-
-    if (!isset($handler->operator)) {
-      $handler->operator = 'or';
-    }
+  public static function breakPhrase($str, $force_int = FALSE) {
 
-    if ($str == '') {
-      return $handler;
-    }
+    $return = array();
 
-    // Determine if the string has 'or' operators (plus signs) or 'and' operators
-    // (commas) and split the string accordingly. If we have an 'and' operator,
-    // spaces are treated as part of the word being split, but otherwise they are
-    // treated the same as a plus sign.
-    $or_wildcard = '[^\s+,]';
-    $and_wildcard = '[^+,]';
-    if (preg_match("/^({$or_wildcard}+[+ ])+{$or_wildcard}+$/", $str)) {
-      $handler->operator = 'or';
-      $handler->value = preg_split('/[+ ]/', $str);
+    // Determine if the string has 'or' operators (plus signs) or 'and'
+    // operators (commas) and split the string accordingly.
+    if (strpos($str, '+')) {
+      $return['value'] = explode('+', $str);
+      $return['operator'] = 'or';
     }
-    elseif (preg_match("/^({$and_wildcard}+,)*{$and_wildcard}+$/", $str)) {
-      $handler->operator = 'and';
-      $handler->value = explode(',', $str);
+    else {
+      $return['value'] = explode(',', $str);
+      $return['operator'] = 'and';
     }
 
-    // Keep an 'error' value if invalid strings were given.
-    if (!empty($str) && (empty($handler->value) || !is_array($handler->value))) {
-      $handler->value = array(-1);
-      return $handler;
+    if ($force_int) {
+      foreach ($return['value'] as $value) {
+        if (!is_int($value)) {
+          $return['value'] = array();
+          break;
+        }
+      }
     }
 
-    // Doubly ensure that all values are strings only.
-    foreach ($handler->value as $id => $value) {
-      $handler->value[$id] = (string) $value;
+    // Return an 'error' value if invalid strings were given.
+    if (empty($return['value'])) {
+      $return['value'] = array(-1);
     }
 
-    return $handler;
+    return $return;
   }
-
 }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
index b0807ad..8dc1b18 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
@@ -117,12 +117,11 @@ public function query($group_by = FALSE) {
     }
 
     if (!empty($this->options['break_phrase'])) {
-      if (!empty($this->definition['numeric'])) {
-        $this->breakPhrase($this->argument, $this);
-      }
-      else {
-        $this->breakPhraseString($this->argument, $this);
-      }
+      $force_int = empty($this->definition['numeric']) ? FALSE : TRUE;
+
+      $breakPhrase = HandlerBase::breakPhrase($this->argument, $force_int);
+      $this->value = array($breakPhrase['value']);
+      $this->operator = $breakPhrase['operator'];
     }
     else {
       $this->value = array($this->argument);
@@ -138,7 +137,9 @@ function title() {
     }
 
     if (!empty($this->options['break_phrase'])) {
-      $this->breakPhrase($this->argument, $this);
+      $breakPhrase = HandlerBase::breakPhrase($this->argument);
+      $this->value = array($breakPhrase['value']);
+      $this->operator = $breakPhrase['operator'];
     }
     else {
       $this->value = array($this->argument);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php
index 3972b4d..c16996c 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php
@@ -100,7 +100,9 @@ public function query($group_by = FALSE) {
     $this->ensureMyTable();
 
     if (!empty($this->options['break_phrase'])) {
-      $this->breakPhrase($this->argument, $this);
+      $breakPhrase = HandlerBase::breakPhrase($this->argument, TRUE);
+      $this->value = array($breakPhrase['value']);
+      $this->operator = $breakPhrase['operator'];
     }
     else {
       $this->value = array($this->argument);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
index 59148de..62fb31c 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
@@ -186,7 +186,9 @@ public function query($group_by = FALSE) {
     }
 
     if (!empty($this->options['break_phrase'])) {
-      $this->breakPhraseString($argument, $this);
+      $breakPhrase = HandlerBase::breakPhrase($this->argument);
+      $this->value = array($breakPhrase['value']);
+      $this->operator = $breakPhrase['operator'];
     }
     else {
       $this->value = array($argument);
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php
index 00d6b3e..5c9e14f 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php
@@ -141,39 +141,62 @@ function testBreakPhraseString() {
    * Tests Drupal\views\Plugin\views\HandlerBase::breakPhrase() function.
    */
   function testBreakPhrase() {
-    $empty_stdclass = new \stdClass();
-    $empty_stdclass->operator = 'or';
-    $empty_stdclass->value = array();
-
-    $null = NULL;
-    // check defaults
-    $this->assertEqual($empty_stdclass, HandlerBase::breakPhrase('', $null));
 
-    $handler = views_get_handler('node', 'title', 'argument');
-    $this->assertEqual($handler, HandlerBase::breakPhrase('', $handler), 'The breakPhrase() method works correctly.');
+    // Check defaults.
+    $this->assertEqual(array(-1), HandlerBase::breakPhrase(''));
 
-    // Generate three random numbers which can be used below;
+    // Generate three random numbers and one string which can be used below.
+    $s1 = $this->randomName();
     $n1 = rand(0, 100);
     $n2 = rand(0, 100);
     $n3 = rand(0, 100);
-    // test ors
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1 $n2+$n3", $handler));
-    $this->assertEqual('or', $handler->operator);
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1+$n2+$n3", $handler));
-    $this->assertEqual('or', $handler->operator);
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1 $n2 $n3", $handler));
-    $this->assertEqual('or', $handler->operator);
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1 $n2++$n3", $handler));
-    $this->assertEqual('or', $handler->operator);
 
-    // test ands.
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1,$n2,$n3", $handler));
-    $this->assertEqual('and', $handler->operator);
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1,,$n2,$n3", $handler));
-    $this->assertEqual('and', $handler->operator);
+    // Test "or"s.
+    $breakPhrase = HandlerBase::breakPhrase("$s1 $n2+$n3");
+    $this->assertEqualValue(array($s1, $n2, $n3), $breakPhrase['value']);
+    $this->assertEqual('or', $breakPhrase['operator']);
+
+    $breakPhrase = HandlerBase::breakPhrase("$s1+$n2+$n3");
+    $this->assertEqualValue(array($s1, $n2, $n3), $breakPhrase['value']);
+    $this->assertEqual('or', $breakPhrase['operator']);
+
+    $breakPhrase = HandlerBase::breakPhrase("$s1 $n2 $n3");
+    $this->assertEqualValue(array($s1, $n2, $n3), $breakPhrase['value']);
+    $this->assertEqual('or', $breakPhrase['operator']);
+
+    $breakPhrase = HandlerBase::breakPhrase("$s1 $n2++$n3");
+    $this->assertEqualValue(array($s1, $n2, $n3), $breakPhrase['value']);
+    $this->assertEqual('or', $breakPhrase['operator']);
+
+    // Test "and"s.
+    $breakPhrase = HandlerBase::breakPhrase("$s1,$n2,$n3");
+    $this->assertEqualValue(array($s1, $n2, $n3), $breakPhrase['value']);
+    $this->assertEqual('and', $breakPhrase['operator']);
+
+    $breakPhrase = HandlerBase::breakPhrase("$s1,,$n2,$n3");
+    $this->assertEqualValue(array($s1, $n2, $n3), $breakPhrase['value']);
+    $this->assertEqual('and', $breakPhrase['operator']);
+
+    // Enforce int values.
+    $breakPhrase = HandlerBase::breakPhrase("$n1,$n2,$n3", TRUE);
+    $this->assertEqualValue(array($s1, $n2, $n3), $breakPhrase['value']);
+    $this->assertEqual('and', $breakPhrase['operator']);
+
+    $breakPhrase = HandlerBase::breakPhrase("$n1+$n2+$n3", TRUE);
+    $this->assertEqualValue(array($s1, $n2, $n3), $breakPhrase['value']);
+    $this->assertEqual('and', $breakPhrase['operator']);
+
+    // Fail on strings.
+    $breakPhrase = HandlerBase::breakPhrase("$s1,$n2,$n3", TRUE);
+    $this->assertEqualValue(array(-1), $breakPhrase['value']);
+    $this->assertEqual('and', $breakPhrase['operator']);
+
+    $breakPhrase = HandlerBase::breakPhrase("$s1+$n2+$n3", TRUE);
+    $this->assertEqualValue(array(-1), $breakPhrase['value']);
+    $this->assertEqual('and', $breakPhrase['operator']);
   }
 
-   /**
+  /**
    * Tests the order of handlers is the same before and after saving.
    */
   public function testHandlerWeights() {