diff --git a/includes/views/flag_plugin_argument_validate_flaggability.inc b/includes/views/flag_plugin_argument_validate_flaggability.inc
index c8f6e30..f653412 100644
--- a/includes/views/flag_plugin_argument_validate_flaggability.inc
+++ b/includes/views/flag_plugin_argument_validate_flaggability.inc
@@ -33,35 +33,35 @@ class flag_plugin_argument_validate_flaggability extends views_plugin_argument_v
     }
     $options = $this->flags_options();
 
-    $form[$this->_option_name('flag_name')] = array(
+    $form['flag_name'] = array(
       '#type' => 'radios',
       '#title' => t('Flag'),
       '#options' => $options,
-      '#default_value' => $this->_get_option('flag_name', '*relationship*'),
+      '#default_value' => $this->options['flag_name'],
       '#description' => t('Select the flag to validate against.'),
     );
     if (!$options) {
-      $form[$this->_option_name('flag_name')]['#description'] = '<p class="warning">' . t('No %type flags exist. You must first <a href="@create-url">create a %type flag</a> before being able to use one.', array('%type' => $this->flag_type, '@create-url' => FLAG_ADMIN_PATH)) . '</p>';
+      $form['flag_name']['#description'] = '<p class="warning">' . t('No %type flags exist. You must first <a href="@create-url">create a %type flag</a> before being able to use one.', array('%type' => $this->flag_type, '@create-url' => FLAG_ADMIN_PATH)) . '</p>';
     }
 
-    $form[$this->_option_name('flag_test')] = array(
+    $form['flag_test'] = array(
       '#type' => 'select',
       '#title' => t('Validate the @type only if', array('@type' => $this->flag_type)),
       '#options' => $this->tests_options(),
-      '#default_value' => $this->_get_option('flag_test', 'flaggable'),
+      '#default_value' => $this->options['flag_test'],
     );
 
     // This validator supports the "multiple IDs" syntax. It may not be
     // extremely useful, but similar validators do support this and it's a good
     // thing to be compatible.
-    $form[$this->_option_name('flag_id_type')] = array(
+    $form['flag_id_type'] = array(
       '#type' => 'select',
       '#title' => t('Argument type'),
       '#options' => array(
         'id' => t('ID'),
         'ids' => t('IDs separated by , or +'),
       ),
-      '#default_value' => $this->_get_option('flag_id_type', 'id'),
+      '#default_value' => $this->options['flag_id_type'],
     );
   }
 
@@ -125,7 +125,7 @@ class flag_plugin_argument_validate_flaggability extends views_plugin_argument_v
   }
 
   function get_flag() {
-    $flag_name = $this->_get_option('flag_name', '*relationship*');
+    $flag_name = $this->options['flag_name'];
 
     if ($flag_name == '*relationship*') {
       // Pick the first flag mentioned in the relationships.
@@ -149,8 +149,8 @@ class flag_plugin_argument_validate_flaggability extends views_plugin_argument_v
    * carry out is determined by 'flag_test'.
    */
   function validate_argument($argument) {
-    $flag_test = $this->_get_option('flag_test', 'flaggable');
-    $id_type   = $this->_get_option('flag_id_type', 'id');
+    $flag_test = $this->options['flag_test'];
+    $id_type   = $this->options['flag_id_type'];
 
     $flag = $this->get_flag();
     if (!$flag) {