diff --git a/modules/aggregator.module b/modules/aggregator.module
index cf3eb7189e721ec96c048b08089a03c9561dd7ef..4247e68fefc47ca716e8a6e33cd9f9ede698b5d9 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -62,7 +62,7 @@ function aggregator_settings() {
 
   $form['aggregator_category_selector'] = array(
     '#type' => 'radios', '#title' => t('Category selection type'), '#default_value' => variable_get('aggregator_category_selector', 'check'),
-    '#options' => array('check' => t('checkboxes'), 'select' => t('multiple selector')),
+    '#options' => array('checkboxes' => t('checkboxes'), 'select' => t('multiple selector')),
     '#description' => t('The type of category selection widget which is shown on categorization pages. Checkboxes are easier to use; a multiple selector is good for working with large numbers of categories.')
   );
   return $form;
@@ -999,9 +999,8 @@ function aggregator_page_list_validate($form_id, &$form) {
   }
 }
 
-function aggregator_page_list_submit($form_id, $form) {
-  global $form_values;
-  foreach ($form_values['categories'] as $iid => $selection) {
+function aggregator_page_list_submit($form_id, $form_values) {
+  foreach ($form_values as $iid => $selection) {
     db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $iid);
     foreach ($selection as $cid) {
       if ($cid) {
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index cf3eb7189e721ec96c048b08089a03c9561dd7ef..4247e68fefc47ca716e8a6e33cd9f9ede698b5d9 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -62,7 +62,7 @@ function aggregator_settings() {
 
   $form['aggregator_category_selector'] = array(
     '#type' => 'radios', '#title' => t('Category selection type'), '#default_value' => variable_get('aggregator_category_selector', 'check'),
-    '#options' => array('check' => t('checkboxes'), 'select' => t('multiple selector')),
+    '#options' => array('checkboxes' => t('checkboxes'), 'select' => t('multiple selector')),
     '#description' => t('The type of category selection widget which is shown on categorization pages. Checkboxes are easier to use; a multiple selector is good for working with large numbers of categories.')
   );
   return $form;
@@ -999,9 +999,8 @@ function aggregator_page_list_validate($form_id, &$form) {
   }
 }
 
-function aggregator_page_list_submit($form_id, $form) {
-  global $form_values;
-  foreach ($form_values['categories'] as $iid => $selection) {
+function aggregator_page_list_submit($form_id, $form_values) {
+  foreach ($form_values as $iid => $selection) {
     db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $iid);
     foreach ($selection as $cid) {
       if ($cid) {