Index: form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.28
diff -u -r1.28 form.inc
--- form.inc	5 Dec 2005 09:48:54 -0000	1.28
+++ form.inc	5 Dec 2005 17:11:57 -0000
@@ -266,14 +266,14 @@
   }
 
   // Allow for elements to expand to multiple elements. Radios, checkboxes and files for instance.
-  if (isset($form['#process']) && !$form['#processed']) {
-    foreach ($form['#process'] as $process => $args) {
+  if (isset($form['#expand']) && !$form['#expanded']) {
+    foreach ($form['#expand'] as $process => $args) {
       if (function_exists($process)) {
         $args = array_merge(array($form), $args);
         $form = call_user_func_array($process, $args);
       }
     }
-    $form['#processed'] = TRUE;
+    $form['#expanded'] = TRUE;
   }
 
   // Recurse through all child elements.
@@ -632,7 +632,7 @@
     }
     foreach ($element['#options'] as $key => $choice) {
       if (!isset($element[$key])) {
-        $element[$key] = array('#type' => 'checkbox', '#processed' => TRUE, '#title' => $choice, '#default_value' => in_array($key, $value), '#attributes' => $element['#attributes']);
+        $element[$key] = array('#type' => 'checkbox', '#expanded' => TRUE, '#title' => $choice, '#default_value' => in_array($key, $value), '#attributes' => $element['#attributes']);
       }
     }
   }

Index: system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.265
diff -u -r1.265 system.module
--- system.module	3 Dec 2005 09:44:50 -0000	1.265
+++ system.module	5 Dec 2005 17:12:21 -0000
@@ -64,12 +64,12 @@
   $type['textfield'] = array('#input' => TRUE, '#size' => 60, '#maxlength' => 128, '#autocomplete_path' => FALSE);
   $type['password'] = array('#input' => TRUE, '#size' => 30, '#maxlength' => 64);
   $type['textarea'] = array('#input' => TRUE, '#cols' => 60, '#rows' => 5);
-  $type['radios'] = array('#input' => TRUE, '#process' => array('expand_radios' => array()));
+  $type['radios'] = array('#input' => TRUE, '#expand' => array('expand_radios' => array()));
   $type['radio'] = array('#input' => TRUE);
-  $type['checkboxes'] = array('#input' => TRUE, '#process' => array('expand_checkboxes' => array()), '#tree' => TRUE);
+  $type['checkboxes'] = array('#input' => TRUE, '#expand' => array('expand_checkboxes' => array()), '#tree' => TRUE);
   $type['select'] = array('#input' => TRUE);
   $type['weight'] = array('#input' => TRUE, '#delta' => 10);
-  $type['date'] = array('#input' => TRUE, '#process' => array('expand_date' => array()));
+  $type['date'] = array('#input' => TRUE, '#expand' => array('expand_date' => array()));
   $type['file'] = array('#input' => TRUE, '#size' => 60);
 
   // Form structure