diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index eb53921..c22c97f 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -217,8 +217,6 @@ function shortcut_set_switch_access($account = NULL) {
 
 /**
  * Access callback for editing a link in a shortcut set.
- *
- * @deprecated, use \Drupal\shortcut\Access\LinkDeleteAccessCheck instead.
  */
 function shortcut_link_access($menu_link) {
   // The link must belong to a shortcut set that the current user has access
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
index d1e2559..5222678 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
@@ -18,6 +18,9 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
+/*
+ * Provides terms overview form for a taxonomy vocabulary.
+ */
 class OverviewTerms implements ControllerInterface, FormInterface {
 
   /**
@@ -125,6 +128,7 @@ public function getFormId() {
    *   The form structure.
    */
   public function buildForm(array $form, array &$form_state, VocabularyInterface $taxonomy_vocabulary = NULL) {
+    // @todo Remove global variables when http://drupal.org/node/2044435 is in.
     global $pager_page_array, $pager_total, $pager_total_items;
 
     // Check for confirmation forms.
@@ -326,14 +330,14 @@ public function buildForm(array $form, array &$form_state, VocabularyInterface $
         ),
         'delete' => array(
           'title' => $this->translation->translate('delete'),
-          'href' => 'taxonomy/term/' . $term->id() . '/delete',
+          'href' => $uri['path'] . '/delete',
           'query' => $destination,
         ),
       );
       if ($this->moduleHandler->invoke('content_translation', 'translate_access', array($term))) {
         $operations['translate'] = array(
           'title' => $this->translation->translate('translate'),
-          'href' => 'taxonomy/term/' . $term->id() . '/translations',
+          'href' => $uri['path'] . '/translations',
           'query' => $destination,
         );
       }
@@ -426,9 +430,9 @@ public function validateForm(array &$form, array &$form_state) {}
    * Because there might be hundreds or thousands of taxonomy terms that need to
    * be ordered, terms are weighted from 0 to the number of terms in the
    * vocabulary, rather than the standard -10 to 10 scale. Numbers are sorted
-   * lowest to highest, but are not necessarily sequential. Numbers may be skipped
-   * when a term has children so that reordering is minimal when a child is
-   * added or removed from a term.
+   * lowest to highest, but are not necessarily sequential. Numbers may be
+   * skipped when a term has children so that reordering is minimal when a child
+   * is added or removed from a term.
    *
    * @param array $form
    *   An associative array containing the structure of the form.