diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 7175cb5..231f128 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -468,7 +468,7 @@ function forum_permission() {
 /**
  * Implements hook_taxonomy_term_delete().
  */
-function forum_taxonomy_term_delete(stdClass $term) {
+function forum_taxonomy_term_delete(TaxonomyTerm $term) {
   // For containers, remove the tid from the forum_containers variable.
   $containers = variable_get('forum_containers', array());
   $key = array_search($term->tid, $containers);
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index c21e9ec..fdc6ccc 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -992,8 +992,8 @@ function taxonomy_vocabulary_load_multiple($vids = array(), $conditions = array(
  *   The vocabulary's ID.
  *
  * @return TaxonomyVocabulary|false
- *   The taxonomy vocabulary entity, if exists, FALSE otherwise.
- *   Results are statically cached.
+ *   The taxonomy vocabulary entity, if exists, FALSE otherwise. Results are
+ *   statically cached.
  *
  * @see taxonomy_vocabulary_machine_name_load()
  */
@@ -1009,8 +1009,8 @@ function taxonomy_vocabulary_load($vid) {
  *   The vocabulary's machine name.
  *
  * @return TaxonomyVocabulary|false
- *   The taxonomy vocabulary entity, if exists, FALSE otherwise.
- *   Results are statically cached.
+ *   The taxonomy vocabulary entity, if exists, FALSE otherwise. Results are
+ *   statically cached.
  *
  * @see taxonomy_vocabulary_load()
  */
diff --git a/core/modules/taxonomy/taxonomy.test b/core/modules/taxonomy/taxonomy.test
index 2212082..d12b62f 100644
--- a/core/modules/taxonomy/taxonomy.test
+++ b/core/modules/taxonomy/taxonomy.test
@@ -583,6 +583,7 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
 
     // Load and save a term, confirming that parents are still set.
     $term = taxonomy_term_load($term2->tid);
+    taxonomy_term_save($term);
     $parents = taxonomy_term_load_parents($term2->tid);
     $this->assertTrue(isset($parents[$term1->tid]), t('Parent found correctly.'));