diff --git a/nodewords.module b/nodewords.module
index 4cf678b..9c961b8 100644
--- a/nodewords.module
+++ b/nodewords.module
@@ -202,61 +202,48 @@ function nodewords_form_node_type_form_alter(&$form, &$form_state) {
  * Implements hook_form_FORM_ID_alter().
  */
 function nodewords_form_taxonomy_form_term_alter(&$form, &$form_state) {
-  $bool = (isset($form['tid']['#value']) &&
-    !isset($form_state['confirm_delete']) &&
-    !isset($form_state['confirm_parents'])
+  if (!empty($form_state['values']['nodewords'])) {
+    $tags = $form_state['values']['nodewords'];
+  }
+  elseif (isset($form['tid']['#value']) && is_numeric($form['tid']['#value'])) {
+    $tags = nodewords_load_tags(NODEWORDS_TYPE_TERM, $form['tid']['#value']);
+  }
+  else {
+    $tags = array();
+  }
+
+  $form['nodewords'] = nodewords_form(
+    NODEWORDS_TYPE_TERM,
+    $tags
   );
 
-  if ($bool) {
-    $id = $form['tid']['#value'];
-
-    if (!empty($form_state['values']['nodewords'])) {
-      $tags = $form_state['values']['nodewords'];
-    }
-    elseif (isset($id) && is_numeric($id)) {
-      $tags = nodewords_load_tags(NODEWORDS_TYPE_TERM, $id);
-    }
-    else {
-      $tags = array();
-    }
-
-    $form['nodewords'] = nodewords_form(
-      NODEWORDS_TYPE_TERM,
-      $tags
-    );
-
-    // Ensure the submit & delete buttons are at the bottom. Hopefully.
-    $form['submit']['#weight'] = 1000;
-    $form['delete']['#weight'] = 1001;
-  }
+  // Ensure the submit & delete buttons are at the bottom. Hopefully.
+  $form['submit']['#weight'] = 1000;
+  $form['delete']['#weight'] = 1001;
 }
 
 /**
  * Implements hook_form_FORM_ID_alter().
  */
 function nodewords_form_taxonomy_form_vocabulary_alter(&$form, &$form_state) {
-  if (isset($form['vid']['#value'])) {
-    $id = $form['vid']['#value'];
-
-    if (!empty($form_state['values']['nodewords'])) {
-      $tags = $form_state['values']['nodewords'];
-    }
-    elseif (isset($id) && is_numeric($id)) {
-      $tags = nodewords_load_tags(NODEWORDS_TYPE_VOCABULARY, $id);
-    }
-    else {
-      $tags = array();
-    }
+  if (!empty($form_state['values']['nodewords'])) {
+    $tags = $form_state['values']['nodewords'];
+  }
+  elseif (isset($form['vid']['#value']) && is_numeric($form['vid']['#value'])) {
+    $tags = nodewords_load_tags(NODEWORDS_TYPE_VOCABULARY, $form['vid']['#value']);
+  }
+  else {
+    $tags = array();
+  }
 
-    $form['nodewords'] = nodewords_form(
-      NODEWORDS_TYPE_VOCABULARY,
-      $tags
-    );
+  $form['nodewords'] = nodewords_form(
+    NODEWORDS_TYPE_VOCABULARY,
+    $tags
+  );
 
-    // Ensure the submit & delete buttons are at the bottom. Hopefully.
-    $form['submit']['#weight'] = 1000;
-    $form['delete']['#weight'] = 1001;
-  }
+  // Ensure the submit & delete buttons are at the bottom. Hopefully.
+  $form['submit']['#weight'] = 1000;
+  $form['delete']['#weight'] = 1001;
 }
 
 /**