--- taxonomy_access.module	2010-08-02 10:52:06.000000000 -0500
+++ taxonomy_access.module.new	2010-08-02 10:54:27.000000000 -0500
@@ -241,25 +241,6 @@
 }
 
 /**
- * Implements hook_form_alter().
- *
- * @todo
- *     Move control of "create" op here
- * @todo
- *     Look at feasability to eliminate _restore_terms and _preserve_terms
- *     by simply setting the '#access' attribute for those terms.
- */
-function taxonomy_access_form_alter(&$form, &$form_state, $form_id) {
-  if ($form['#id'] == 'node-form' && is_numeric($form['nid']['#value'])) {
-    $form['tac_protected_terms'] = array(
-      '#type' => 'value',
-      '#value' => taxonomy_access_preserve_terms($form['#node'])
-    );
-  }
-}
-
-
-/**
  * Implements hook_form_FORM_ID_alter() for taxonomy-form-term.
  * Overriding the term deletion form's submit handler allows us to determine
  * which {node_access} entries must be updated before the {term_data} and
@@ -279,6 +260,23 @@
   $form['#submit'] = array('taxonomy_access_vocabulary_delete_submit');
 }
 
+/**
+ * Implements hook_form_FORM_ID_alter() for node-form.
+ *
+ * @todo
+ *     Move control of "create" op here?
+ * @todo
+ *     Look at feasability to eliminate _restore_terms and _preserve_terms
+ *     by simply setting the '#access' attribute for those terms.
+ */
+function taxonomy_access_form_node_form_alter(&$form, &$form_state) {
+  if (is_numeric($form['nid']['#value'])) {
+    $form['tac_protected_terms'] = array(
+      '#type' => 'value',
+      '#value' => taxonomy_access_preserve_terms($form['#node'])
+    );
+  }
+}
 
 /**
  * Submit handler for term deletions.