diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyMachineName.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyMachineName.php
deleted file mode 100644
index c36e406..0000000
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyMachineName.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\taxonomy\Plugin\views\argument\VocabularyMachineName.
- */
-
-namespace Drupal\taxonomy\Plugin\views\argument;
-
-use Drupal\views\Plugin\views\argument\String;
-use Drupal\Core\Annotation\Plugin;
-
-/**
- * Argument handler to accept a vocabulary machine name.
- *
- * @ingroup views_argument_handlers
- *
- * @Plugin(
- *   id = "vocabulary_machine_name",
- *   module = "taxonomy"
- * )
- */
-class VocabularyMachineName extends String {
-
-  /**
-   * Override the behavior of title(). Get the name of the vocabulary..
-   */
-  function title() {
-    $query = db_select('taxonomy_vocabulary', 'v');
-    $query->addField('v', 'name');
-    $query->condition('v.machine_name', $this->argument);
-    $title = $query->execute()->fetchField();
-
-    if (empty($title)) {
-      return t('No vocabulary');
-    }
-
-    return check_plain($title);
-  }
-
-}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyMachineName.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyMachineName.php
deleted file mode 100644
index 8be71e6..0000000
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyMachineName.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\taxonomy\Plugin\views\filter\VocabularyMachineName.
- */
-
-namespace Drupal\taxonomy\Plugin\views\filter;
-
-use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugin\views\filter\InOperator;
-
-/**
- * Filter by vocabulary machine name.
- *
- * @ingroup views_filter_handlers
- *
- * @Plugin(
- *   id = "vocabulary_machine_name",
- *   module = "taxonomy"
- * )
- */
-class VocabularyMachineName extends InOperator {
-
-  function get_value_options() {
-    if (isset($this->value_options)) {
-      return;
-    }
-
-    $this->value_options = array();
-    $vocabularies = taxonomy_vocabulary_get_names();
-    foreach ($vocabularies as $voc) {
-      $this->value_options[$voc->machine_name] = $voc->name;
-    }
-  }
-
-}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php
index 2ff20cf..13514d2 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php
@@ -16,7 +16,7 @@
 class VocabularyStorageController extends ConfigStorageController {
 
   /**
-   * Overrides Drupal\config\ConfigStorageController::postSave().
+   * Overrides Drupal\Core\Config\Entity\ConfigStorageController::postSave().
    */
   protected function postSave(EntityInterface $entity, $update) {
     if (!$update) {
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 03045d1..9896915 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -684,7 +684,7 @@ function taxonomy_term_load_parents_all($tid) {
  *   An array of term objects that are the children of the term $tid, or an
  *   empty array when no children exist.
  */
-function taxonomy_term_load_children($tid, $bundle = 0) {
+function taxonomy_term_load_children($tid, $bundle = NULL) {
   $children = &drupal_static(__FUNCTION__, array());
 
   if ($tid && !isset($children[$tid])) {