Index: handlers/views_handler_argument_many_to_one.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_argument_many_to_one.inc,v
retrieving revision 1.1.6.3
diff -u -p -r1.1.6.3 views_handler_argument_many_to_one.inc
--- handlers/views_handler_argument_many_to_one.inc	22 Mar 2010 20:40:31 -0000	1.1.6.3
+++ handlers/views_handler_argument_many_to_one.inc	13 Jan 2011 14:19:31 -0000
@@ -33,7 +33,14 @@ class views_handler_argument_many_to_one
     $options['add_table'] = array('default' => FALSE);
     $options['require_value'] = array('default' => FALSE);
 
-    views_many_to_one_helper::option_definition($options);
+    if (isset($this->helper)) {
+      $this->helper->option_definition($options);
+    }
+    else {
+      $helper = new views_many_to_one_helper($this);
+      $helper->option_definition($options);
+    }
+    
     return $options;
   }
 
Index: handlers/views_handler_filter_many_to_one.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter_many_to_one.inc,v
retrieving revision 1.2.4.5
diff -u -p -r1.2.4.5 views_handler_filter_many_to_one.inc
--- handlers/views_handler_filter_many_to_one.inc	12 Oct 2010 22:14:55 -0000	1.2.4.5
+++ handlers/views_handler_filter_many_to_one.inc	13 Jan 2011 14:19:31 -0000
@@ -21,7 +21,13 @@ class views_handler_filter_many_to_one e
     $options['operator']['default'] = 'or';
     $options['value']['default'] = array();
 
-    views_many_to_one_helper::option_definition($options);
+    if (isset($this->helper)) {
+      $this->helper->option_definition($options);
+    }
+    else {
+      $helper = new views_many_to_one_helper($this);
+      $helper->option_definition($options);
+    }
 
     return $options;
   }
Index: modules/taxonomy/views_handler_filter_term_node_tid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc,v
retrieving revision 1.8.6.14
diff -u -p -r1.8.6.14 views_handler_filter_term_node_tid.inc
--- modules/taxonomy/views_handler_filter_term_node_tid.inc	24 Dec 2010 13:42:01 -0000	1.8.6.14
+++ modules/taxonomy/views_handler_filter_term_node_tid.inc	13 Jan 2011 14:19:32 -0000
@@ -196,7 +196,7 @@ class views_handler_filter_term_node_tid
     }
   }
 
-  function value_validate(&$form, &$form_state) {
+  function value_validate($form, &$form_state) {
     // We only validate if they've chosen the text field style.
     if ($this->options['type'] != 'textfield') {
       return;
Index: modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc,v
retrieving revision 1.6.4.8
diff -u -p -r1.6.4.8 views_plugin_argument_validate_taxonomy_term.inc
--- modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc	14 Dec 2010 22:32:11 -0000	1.6.4.8
+++ modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc	13 Jan 2011 14:19:32 -0000
@@ -9,7 +9,7 @@
  * Validate whether an argument is an acceptable node.
  */
 class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument_validate {
-  function init(&$view, &$argument, &$options) {
+  function init(&$view, &$argument, $options) {
     parent::init($view, $argument, $options);
 
     // Convert legacy vids option to machine name vocabularies.
@@ -69,9 +69,9 @@ class views_plugin_argument_validate_tax
     );
   }
 
-  function options_submit(&$form, &$form_state, &$options) {
+  function options_submit(&$form, &$form_state) {
     // filter trash out of the options so we don't store giant unnecessary arrays
-    $options['vocabularies'] = array_filter($options['vocabularies']);
+    $form_state['values']['vocabularies'] = array_filter($form_state['values']['vocabularies']);
   }
 
   function convert_options(&$options) {