diff --git includes/form.inc includes/form.inc
index 230db85..7c4c811 100644
--- includes/form.inc
+++ includes/form.inc
@@ -47,9 +47,7 @@
  */
 
 /**
- * Retrieves a form from a constructor function, or from the cache if
- * the form was built in a previous page-load. The form is then passed
- * on for processing, after and rendered for display if necessary.
+ * Wrapper for drupal_build_form() for use when $form_state is not needed.
  *
  * @param $form_id
  *   The unique string identifying the desired form. If a function
@@ -67,9 +65,68 @@
  *   The rendered form.
  */
 function drupal_get_form($form_id) {
-  $form_state = array('storage' => NULL, 'submitted' => FALSE);
+  $form_state = array();
 
   $args = func_get_args();
+  // Remove the form id from the arguments.
+  array_shift($args);
+  $form_state['args'] = $args;
+
+  return drupal_build_form($form_id, $form_state);
+}
+
+/**
+ * Retrieves a form from a constructor function.
+ *
+ * The form may also be retrieved from from the cache if the form was
+ * built in a previous page-load. The form is then passed on for processing,
+ * validation and submission if there is proper input, and then rendered for
+ * display if necessary.
+ *
+ * @param $form_id
+ *   The unique string identifying the desired form. If a function
+ *   with that name exists, it is called to build the form array.
+ *   Modules that need to generate the same form (or very similar forms)
+ *   using different $form_ids can implement hook_forms(), which maps
+ *   different $form_id values to the proper form constructor function. Examples
+ *   may be found in node_forms(), search_forms(), and user_forms().
+ * @param &$form_state
+ *   The $form_state array which stores information about the form. This
+ *   is passed as a reference so that the caller can use it to examine
+ *   what the form changed when the form submission process is complete.
+ *
+ *   Unlike drupal_get_form() where args are passed as additional arguments,
+ *   Any arguments should be in $form_state['args']. Otherwise, this function
+ *   is very similar to drupal_get_form().
+ *
+ *   The following parameters may be set in $form_state to affect how the
+ *   form is rendered:
+ *   - args: An array of arguments to pass to the form builder.
+ *   - input: An array of input that corresponds to $_POST.
+ *   - method: May be 'post' or 'get'. Defaults to 'post'. Note that 'get' method
+ *     forms do not use form IDs so are always considered to be submitted. This
+ *     can have unexpected effects.
+ *   - rerender: May be set to FALSE to force form not to re-render after submit.
+ *   - no_redirect: If set to TRUE the form will NOT perform a drupal_goto even
+ *     if a redirect is set.
+ *   - always_process: If TRUE and the method is GET, a form_id is not necessary.
+ *     This should *only* be used on RESTful get forms that do NOT write data,
+ *     as this could lead to security issues.
+ *   - must_validate: Ordinarily a form is only validated once but there are times,
+ *     when a form is resubmitted internally and should be validated again. Setting
+ *     this to TRUE will force that to happen.
+ * @return
+ *   The rendered form.
+ */
+function drupal_build_form($form_id, &$form_state) {
+  // Ensure that we have some defaults.
+  // These are defaults only; if already set they will not be overridden.
+  $form_state += form_state_defaults();
+
+  if (!isset($form_state['input'])) {
+    $form_state['input'] = $form_state['method'] == 'get' ? $_GET : $_POST;
+  }
+
   $cacheable = FALSE;
 
   if (isset($_SESSION['batch_form_state'])) {
@@ -80,36 +137,35 @@ function drupal_get_form($form_id) {
     unset($_SESSION['batch_form_state']);
   }
   else {
-    // If the incoming $_POST contains a form_build_id, we'll check the
+    // If the incoming input contains a form_build_id, we'll check the
     // cache for a copy of the form in question. If it's there, we don't
     // have to rebuild the form to proceed. In addition, if there is stored
     // form_state data from a previous step, we'll retrieve it so it can
     // be passed on to the form processing code.
-    if (isset($_POST['form_id']) && $_POST['form_id'] == $form_id && !empty($_POST['form_build_id'])) {
-      $form = form_get_cache($_POST['form_build_id'], $form_state);
+    if (isset($form_state['input']['form_id']) && $form_state['input']['form_id'] == $form_id && !empty($form_state['input']['form_build_id'])) {
+      $form = form_get_cache($form_state['input']['form_build_id'], $form_state);
     }
 
     // If the previous bit of code didn't result in a populated $form
     // object, we're hitting the form for the first time and we need
     // to build it from scratch.
     if (!isset($form)) {
-      $form_state['post'] = $_POST;
-      // Use a copy of the function's arguments for manipulation
-      $args_temp = $args;
-      $args_temp[0] = &$form_state;
-      array_unshift($args_temp, $form_id);
-
-      $form = call_user_func_array('drupal_retrieve_form', $args_temp);
+      $form = drupal_retrieve_form($form_id, $form_state);
       $form_build_id = 'form-' . md5(uniqid(mt_rand(), TRUE));
       $form['#build_id'] = $form_build_id;
+
+      // If the form method is set to get in the $form_state but not
+      // the form, or vice versa, fix that.
+      if ($form_state['method'] == 'get' && !isset($form['#method'])) {
+        $form['#method'] = 'get';
+      }
+
       drupal_prepare_form($form_id, $form, $form_state);
       // Store a copy of the unprocessed form for caching and indicate that it
       // is cacheable if #cache will be set.
       $original_form = $form;
       $cacheable = TRUE;
-      unset($form_state['post']);
     }
-    $form['#post'] = $_POST;
 
     // Now that we know we have a form, we'll process it (validating,
     // submitting, and handling the results returned by its submission
@@ -117,7 +173,13 @@ function drupal_get_form($form_id) {
     // altering the $form_state variable, which is passed into them by
     // reference.
     drupal_process_form($form_id, $form, $form_state);
-    if ($cacheable && !empty($form['#cache'])) {
+    // If we were told not to redirect, but not told to re-render, return
+    // here.
+    if (!empty($form_state['executed']) && empty($form_state['rerender'])) {
+      return;
+    }
+
+    if ($cacheable && !empty($form['#cache']) && empty($form['#no_cache'])) {
       // Caching is done past drupal_process_form so #process callbacks can
       // set #cache. By not sending the form state, we avoid storing
       // $form_state['storage'].
@@ -140,7 +202,7 @@ function drupal_get_form($form_id) {
   // other variables passed into drupal_get_form().
 
   if (!empty($form_state['rebuild']) || !empty($form_state['storage'])) {
-    $form = drupal_rebuild_form($form_id, $form_state, $args);
+    $form = drupal_rebuild_form($form_id, $form_state);
   }
 
   // If we haven't redirected to a new location by now, we want to
@@ -148,6 +210,20 @@ function drupal_get_form($form_id) {
   return drupal_render_form($form_id, $form);
 }
 
+
+/**
+ * Retrieve default values for the form state array.
+ */
+function form_state_defaults() {
+  return array(
+    'storage' => NULL,
+    'submitted' => FALSE,
+    'method' => 'post',
+    'rerender' => TRUE,
+    'programmed' => FALSE,
+  );
+}
+
 /**
  * Retrieves a form, caches it and processes it with an empty $_POST.
  *
@@ -162,6 +238,10 @@ function drupal_get_form($form_id) {
  * $form_state['clicked_button']['#array_parents'] will help you to find which
  * part.
  *
+ * If you are getting a form from the cache, use $form['#args'] to shift off
+ * the $form_id from its beginning then the resulting array can be given to
+ * $form_state['args'].
+ *
  * @param $form_id
  *   The unique string identifying the desired form. If a function
  *   with that name exists, it is called to build the form array.
@@ -172,12 +252,6 @@ function drupal_get_form($form_id) {
  * @param $form_state
  *   A keyed array containing the current state of the form. Most
  *   important is the $form_state['storage'] collection.
- * @param $args
- *   Any additional arguments are passed on to the functions called by
- *   drupal_get_form(), plus the original form_state in the beginning. If you
- *   are getting a form from the cache, use $form['#parameters'] to shift off
- *   the $form_id from its beginning then the resulting array can be used as
- *   $arg here.
  * @param $form_build_id
  *   If the AHAH callback calling this function only alters part of the form,
  *   then pass in the existing form_build_id so we can re-cache with the same
@@ -185,14 +259,8 @@ function drupal_get_form($form_id) {
  * @return
  *   The newly built form.
  */
-function drupal_rebuild_form($form_id, &$form_state, $args, $form_build_id = NULL) {
-  // Remove the first argument. This is $form_id.when called from
-  // drupal_get_form and the original $form_state when called from some AHAH
-  // callback. Neither is needed. After that, put in the current state.
-  $args[0] = &$form_state;
-  // And the form_id.
-  array_unshift($args, $form_id);
-  $form = call_user_func_array('drupal_retrieve_form', $args);
+function drupal_rebuild_form($form_id, &$form_state, $form_build_id = NULL) {
+  $form = drupal_retrieve_form($form_id, $form_state);
 
   if (!isset($form_build_id)) {
     // We need a new build_id for the new version of the form.
@@ -201,17 +269,22 @@ function drupal_rebuild_form($form_id, &$form_state, $args, $form_build_id = NUL
   $form['#build_id'] = $form_build_id;
   drupal_prepare_form($form_id, $form, $form_state);
 
-  // Now, we cache the form structure so it can be retrieved later for
-  // validation. If $form_state['storage'] is populated, we'll also cache
-  // it so that it can be used to resume complex multi-step processes.
-  form_set_cache($form_build_id, $form, $form_state);
+  if (empty($form['#no_cache'])) {
+    // Now, we cache the form structure so it can be retrieved later for
+    // validation. If $form_state['storage'] is populated, we'll also cache
+    // it so that it can be used to resume complex multi-step processes.
+    form_set_cache($form_build_id, $form, $form_state);
+  }
 
   // Clear out all post data, as we don't want the previous step's
   // data to pollute this one and trigger validate/submit handling,
   // then process the form for rendering.
-  $_POST = array();
-  $form['#post'] = array();
-  drupal_process_form($form_id, $form, $form_state);
+  $form_state['input'] = array();
+
+  // Originally this called drupal_process_form, but all that happens there
+  // is form_builder and then submission; and the rebuilt form is not
+  // allowed to submit. Therefore, just do this:
+  $form = form_builder($form_id, $form, $form_state);
   return $form;
 }
 
@@ -290,13 +363,19 @@ function form_set_cache($form_build_id, $form, $form_state) {
  * drupal_execute('story_node_form', $form_state, (object)$node);
  */
 function drupal_execute($form_id, &$form_state) {
-  $args = func_get_args();
+  if (!isset($form_state['args'])) {
+    $args = func_get_args();
+    array_shift($args);
+    array_shift($args);
+    $form_state['args'] = $args;
+  }
 
-  // Make sure $form_state is passed around by reference.
-  $args[1] = &$form_state;
+  $form = drupal_retrieve_form($form_id, $form_state);
+  $form_state['input'] = $form_state['values'];
+  $form_state['programmed'] = TRUE;
+  // Merge in default values.
+  $form_state += form_state_defaults();
 
-  $form = call_user_func_array('drupal_retrieve_form', $args);
-  $form['#post'] = $form_state['values'];
   drupal_prepare_form($form_id, $form, $form_state);
   drupal_process_form($form_id, $form, $form_state);
 }
@@ -325,15 +404,8 @@ function drupal_retrieve_form($form_id, &$form_state) {
 
   // We save two copies of the incoming arguments: one for modules to use
   // when mapping form ids to constructor functions, and another to pass to
-  // the constructor function itself. We shift out the first argument -- the
-  // $form_id itself -- from the list to pass into the constructor function,
-  // since it's already known.
-  $args = func_get_args();
-  $saved_args = $args;
-  array_shift($args);
-  if (isset($form_state)) {
-    array_shift($args);
-  }
+  // the constructor function itself.
+  $args = $form_state['args'];
 
   // We first check to see if there's a function named after the $form_id.
   // If there is, we simply pass the arguments on to it to get the form.
@@ -362,18 +434,13 @@ function drupal_retrieve_form($form_id, &$form_state) {
     }
   }
 
-  array_unshift($args, NULL);
-  $args[0] = &$form_state;
+  $args = array_merge(array(&$form_state), $args);
 
   // If $callback was returned by a hook_forms() implementation, call it.
   // Otherwise, call the function named after the form id.
   $form = call_user_func_array(isset($callback) ? $callback : $form_id, $args);
-
-  // We store the original function arguments, rather than the final $arg
-  // value, so that form_alter functions can see what was originally
-  // passed to drupal_retrieve_form(). This allows the contents of #parameters
-  // to be saved and passed in at a later date to recreate the form.
-  $form['#parameters'] = $saved_args;
+  $form['#form_id'] = $form_id;
+  $form['#args'] = $form_state['args'];
   return $form;
 }
 
@@ -395,10 +462,23 @@ function drupal_retrieve_form($form_id, &$form_state) {
 function drupal_process_form($form_id, &$form, &$form_state) {
   $form_state['values'] = array();
 
+  // With $_GET, these forms are always submitted if requested.
+  if ($form_state['method'] == 'get' && !empty($form_state['always_process'])) {
+    if (!isset($form_state['input']['form_build_id'])) {
+      $form_state['input']['form_build_id'] = $form['#build_id'];
+    }
+    if (!isset($form_state['input']['form_id'])) {
+      $form_state['input']['form_id'] = $form_id;
+    }
+    if (!isset($form_state['input']['form_token']) && isset($form['#token'])) {
+      $form_state['input']['form_token'] = drupal_get_token($form['#token']);
+    }
+  }
+
   $form = form_builder($form_id, $form, $form_state);
   // Only process the form if it is programmed or the form_id coming
   // from the POST data is set and matches the current form_id.
-  if ((!empty($form['#programmed'])) || (!empty($form['#post']) && (isset($form['#post']['form_id']) && ($form['#post']['form_id'] == $form_id)))) {
+  if ((!empty($form_state['programmed'])) || (!empty($form_state['input']) && (isset($form_state['input']['form_id']) && ($form_state['input']['form_id'] == $form_id)))) {
     drupal_validate_form($form_id, $form, $form_state);
 
     // form_clean_id() maintains a cache of element IDs it has seen,
@@ -429,7 +509,7 @@ function drupal_process_form($form_id, &$form, &$form_state) {
         // late execution of submit handlers and post-batch redirection.
         $batch['form'] = $form;
         $batch['form_state'] = $form_state;
-        $batch['progressive'] = !$form['#programmed'];
+        $batch['progressive'] = !$form_state['programmed'];
         batch_process();
         // Execution continues only for programmatic forms.
         // For 'regular' forms, we get redirected to the batch processing
@@ -444,8 +524,13 @@ function drupal_process_form($form_id, &$form, &$form_state) {
       // if one hasn't). If the form was called by drupal_execute(),
       // however, we'll skip this and let the calling function examine
       // the resulting $form_state bundle itself.
-      if (!$form['#programmed'] && empty($form_state['rebuild']) && empty($form_state['storage'])) {
-        drupal_redirect_form($form, $form_state['redirect']);
+      if (!$form_state['programmed'] && empty($form_state['rebuild']) && empty($form_state['storage'])) {
+        if (!empty($form_state['no_redirect'])) {
+          $form_state['executed'] = TRUE;
+        }
+        else {
+          drupal_redirect_form($form, $form_state['redirect']);
+        }
       }
     }
   }
@@ -469,7 +554,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
   global $user;
 
   $form['#type'] = 'form';
-  $form['#programmed'] = isset($form['#post']);
+  $form_state['programmed'] = isset($form_state['programmed']) ? $form_state['programmed'] : FALSE;
 
   if (isset($form['#build_id'])) {
     $form['form_build_id'] = array(
@@ -485,14 +570,14 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
   // requested previously by the user and protects against cross site request
   // forgeries.
   if (isset($form['#token'])) {
-    if ($form['#token'] === FALSE || $user->uid == 0 || $form['#programmed']) {
+    if ($form['#token'] === FALSE || $user->uid == 0 || $form_state['programmed']) {
       unset($form['#token']);
     }
     else {
       $form['form_token'] = array('#type' => 'token', '#default_value' => drupal_get_token($form['#token']));
     }
   }
-  elseif (isset($user->uid) && $user->uid && !$form['#programmed']) {
+  elseif (isset($user->uid) && $user->uid && !$form_state['programmed']) {
     $form['#token'] = $form_id;
     $form['form_token'] = array(
       '#id' => form_clean_id('edit-' . $form_id . '-form-token'),
@@ -568,7 +653,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
 function drupal_validate_form($form_id, $form, &$form_state) {
   static $validated_forms = array();
 
-  if (isset($validated_forms[$form_id])) {
+  if (isset($validated_forms[$form_id]) && empty($form_state['must_validate'])) {
     return;
   }
 
@@ -869,7 +954,7 @@ function form_builder($form_id, $form, &$form_state) {
   if (isset($form['#type']) && $form['#type'] == 'form') {
     $cache = NULL;
     $complete_form = $form;
-    if (!empty($form['#programmed'])) {
+    if (!empty($form_state['programmed'])) {
       $form_state['submitted'] = TRUE;
     }
   }
@@ -885,8 +970,6 @@ function form_builder($form_id, $form, &$form_state) {
   // Recurse through all child elements.
   $count = 0;
   foreach (element_children($form) as $key) {
-    $form[$key]['#post'] = $form['#post'];
-    $form[$key]['#programmed'] = $form['#programmed'];
     // Don't squash an existing tree value.
     if (!isset($form[$key]['#tree'])) {
       $form[$key]['#tree'] = $form['#tree'];
@@ -994,15 +1077,15 @@ function _form_builder_handle_input_element($form_id, &$form, &$form_state, $com
 
   if (!isset($form['#value']) && !array_key_exists('#value', $form)) {
     $function = !empty($form['#value_callback']) ? $form['#value_callback'] : 'form_type_' . $form['#type'] . '_value';
-    if (($form['#programmed']) || ((!isset($form['#access']) || $form['#access']) && isset($form['#post']) && (isset($form['#post']['form_id']) && $form['#post']['form_id'] == $form_id))) {
-      $edit = $form['#post'];
+    if (($form_state['programmed']) || ((!isset($form['#access']) || $form['#access']) && isset($form_state['input']) && (isset($form_state['input']['form_id']) && $form_state['input']['form_id'] == $form_id))) {
+      $edit = $form_state['input'];
       foreach ($form['#parents'] as $parent) {
         $edit = isset($edit[$parent]) ? $edit[$parent] : NULL;
       }
-      if (!$form['#programmed'] || isset($edit)) {
+      if (!$form_state['programmed'] || isset($edit)) {
         // Call #type_value to set the form value;
         if (function_exists($function)) {
-          $form['#value'] = $function($form, $edit);
+          $form['#value'] = $function($form, $edit, $form_state);
         }
         if (!isset($form['#value']) && isset($edit)) {
           $form['#value'] = $edit;
@@ -1032,13 +1115,13 @@ function _form_builder_handle_input_element($form_id, &$form, &$form_state, $com
   // We compare the incoming values with the buttons defined in the form,
   // and flag the one that matches. We have to do some funky tricks to
   // deal with Internet Explorer's handling of single-button forms, though.
-  if (!empty($form['#post']) && isset($form['#executes_submit_callback'])) {
+  if (!empty($form_state['input']) && isset($form['#executes_submit_callback'])) {
     // First, accumulate a collection of buttons, divided into two bins:
     // those that execute full submit callbacks and those that only validate.
     $button_type = $form['#executes_submit_callback'] ? 'submit' : 'button';
     $form_state['buttons'][$button_type][] = $form;
 
-    if (_form_button_was_clicked($form)) {
+    if (_form_button_was_clicked($form, $form_state)) {
       $form_state['submitted'] = $form_state['submitted'] || $form['#executes_submit_callback'];
 
       // In most cases, we want to use form_set_value() to manipulate
@@ -1077,13 +1160,13 @@ function _form_builder_handle_input_element($form_id, &$form, &$form_state, $com
  * and we'll never detect a match. That special case is handled by
  * _form_builder_ie_cleanup().
  */
-function _form_button_was_clicked($form) {
+function _form_button_was_clicked($form, &$form_state) {
   // First detect normal 'vanilla' button clicks. Traditionally, all
   // standard buttons on a form share the same name (usually 'op'),
   // and the specific return value is used to determine which was
   // clicked. This ONLY works as long as $form['#name'] puts the
   // value at the top level of the tree of $_POST data.
-  if (isset($form['#post'][$form['#name']]) && $form['#post'][$form['#name']] == $form['#value']) {
+  if (isset($form_state['input'][$form['#name']]) && $form_state['input'][$form['#name']] == $form['#value']) {
     return TRUE;
   }
   // When image buttons are clicked, browsers do NOT pass the form element
@@ -1134,11 +1217,13 @@ function _form_builder_ie_cleanup($form, &$form_state) {
  * @param $edit
  *   The incoming POST data to populate the form element. If this is FALSE,
  *   the element's default value should be returned.
+* @param $form_state
+ *   A keyed array containing the current state of the form.
  * @return
  *   The data that will appear in the $form_state['values'] collection
  *   for this element. Return nothing to use the default.
  */
-function form_type_image_button_value($form, $edit = FALSE) {
+function form_type_image_button_value($form, $edit, $form_state) {
   if ($edit !== FALSE) {
     if (!empty($edit)) {
       // If we're dealing with Mozilla or Opera, we're lucky. It will
@@ -1151,7 +1236,7 @@ function form_type_image_button_value($form, $edit = FALSE) {
       // X and one for the Y coordinates on which the user clicked the
       // button. We'll find this element in the #post data, and search
       // in the same spot for its name, with '_x'.
-      $post = $form['#post'];
+      $post = $form_state['input'];
       foreach (split('\[', $form['#name']) as $element_name) {
         // chop off the ] that may exist.
         if (substr($element_name, -1) == ']') {
@@ -1639,7 +1724,7 @@ function password_confirm_validate($form, &$form_state) {
       form_error($form, t('The specified passwords do not match.'));
     }
   }
-  elseif ($form['#required'] && !empty($form['#post'])) {
+  elseif ($form['#required'] && !empty($form_state['input'])) {
     form_error($form, t('Password field is required.'));
   }
 
@@ -1762,29 +1847,28 @@ function weight_value(&$form) {
  * Menu callback for AHAH callbacks through the #ahah['callback'] FAPI property.
  */
 function form_ahah_callback() {
-  $form_state = array('storage' => NULL, 'submitted' => FALSE);
+  $form_state = form_state_defaults();
+
   $form_build_id = $_POST['form_build_id'];
 
   // Get the form from the cache.
   $form = form_get_cache($form_build_id, $form_state);
-  $args = $form['#parameters'];
-  $form_id = array_shift($args);
 
   // We will run some of the submit handlers so we need to disable redirecting.
   $form['#redirect'] = FALSE;
 
   // We need to process the form, prepare for that by setting a few internals
   // variables.
-  $form['#post'] = $_POST;
-  $form['#programmed'] = FALSE;
-  $form_state['post'] = $_POST;
+  $form_state['input'] = $_POST;
+  $form_state['args'] = $form['#args'];
+  $form_id = $form['#form_id'];
 
   // Build, validate and if possible, submit the form.
   drupal_process_form($form_id, $form, $form_state);
 
   // This call recreates the form relying solely on the form_state that the
   // drupal_process_form set up.
-  $form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id);
+  $form = drupal_rebuild_form($form_id, $form_state, $form_build_id);
 
   // Get the callback function from the clicked button.
   $callback = $form_state['clicked_button']['#ahah']['callback'];
diff --git modules/aggregator/aggregator.admin.inc modules/aggregator/aggregator.admin.inc
index 3c3908c..8b128a8 100644
--- modules/aggregator/aggregator.admin.inc
+++ modules/aggregator/aggregator.admin.inc
@@ -338,6 +338,7 @@ function aggregator_form_opml_submit($form, &$form_state) {
 
     $form_state['values']['title'] = $feed['title'];
     $form_state['values']['url'] = $feed['url'];
+
     drupal_execute('aggregator_form_feed', $form_state);
   }
 
diff --git modules/book/book.admin.inc modules/book/book.admin.inc
index aacdb4d..81e9457 100644
--- modules/book/book.admin.inc
+++ modules/book/book.admin.inc
@@ -106,7 +106,7 @@ function book_admin_edit_validate($form, &$form_state) {
 function book_admin_edit_submit($form, &$form_state) {
   // Save elements in the same order as defined in post rather than the form.
   // This ensures parents are updated before their children, preventing orphans.
-  $order = array_flip(array_keys($form['#post']['table']));
+  $order = array_flip(array_keys($form_state['input']['table']));
   $form['table'] = array_merge($order, $form['table']);
 
   foreach (element_children($form['table']) as $key) {
diff --git modules/book/book.pages.inc modules/book/book.pages.inc
index 2ab3854..1c0489a 100644
--- modules/book/book.pages.inc
+++ modules/book/book.pages.inc
@@ -246,7 +246,6 @@ function book_form_update() {
       form_set_cache($_POST['form_build_id'], $form, $cached_form_state);
       // Build and render the new select element, then return it in JSON format.
       $form_state = array();
-      $form['#post'] = array();
       $form = form_builder($form['form_id']['#value'] , $form, $form_state);
       $output = drupal_render($form['book']['plid']);
       drupal_json(array('status' => TRUE, 'data' => $output));
diff --git modules/comment/comment.admin.inc modules/comment/comment.admin.inc
index 03f0ecb..9c7b803 100644
--- modules/comment/comment.admin.inc
+++ modules/comment/comment.admin.inc
@@ -150,7 +150,7 @@ function comment_admin_overview_submit($form, &$form_state) {
  * @see comment_multiple_delete_confirm_submit()
  */
 function comment_multiple_delete_confirm(&$form_state) {
-  $edit = $form_state['post'];
+  $edit = $form_state['input'];
 
   $form['comments'] = array(
     '#prefix' => '<ul>',
diff --git modules/menu/menu.admin.inc modules/menu/menu.admin.inc
index eed1765..a7a5a8a 100644
--- modules/menu/menu.admin.inc
+++ modules/menu/menu.admin.inc
@@ -132,7 +132,7 @@ function menu_overview_form_submit($form, &$form_state) {
   // parent. To prevent this, save items in the form in the same order they
   // are sent by $_POST, ensuring parents are saved first, then their children.
   // See http://drupal.org/node/181126#comment-632270
-  $order = array_flip(array_keys($form['#post'])); // Get the $_POST order.
+  $order = array_flip(array_keys($form_state['input'])); // Get the $_POST order.
   $form = array_merge($order, $form); // Update our original form with the new order.
 
   $updated_items = array();
diff --git modules/node/node.module modules/node/node.module
index c3a2948..273aeef 100644
--- modules/node/node.module
+++ modules/node/node.module
@@ -250,7 +250,7 @@ function node_mark($nid, $timestamp) {
  * See if the user used JS to submit a teaser.
  */
 function node_teaser_js(&$form, &$form_state) {
-  if (isset($form['#post']['teaser_js'])) {
+  if (isset($form_state['input']['teaser_js'])) {
     // Glue the teaser to the body.
     if (trim($form_state['values']['teaser_js'])) {
       // Space the teaser from the body
@@ -287,8 +287,8 @@ function node_teaser_js(&$form, &$form_state) {
 function node_teaser_include_verify(&$form, &$form_state) {
   $message = '';
 
-  // $form['#post'] is set only when the form is built for preview/submit.
-  if (isset($form['#post']['body']) && isset($form_state['values']['teaser_include']) && !$form_state['values']['teaser_include']) {
+  // $form_state['input'] is set only when the form is built for preview/submit.
+  if (isset($form_state['input']['body']) && isset($form_state['values']['teaser_include']) && !$form_state['values']['teaser_include']) {
     // "teaser_include" checkbox is present and unchecked.
     if (strpos($form_state['values']['body'], '<!--break-->') === 0) {
       // Teaser is empty string.
diff --git modules/openid/openid.module modules/openid/openid.module
index 8a86430..92326d5 100644
--- modules/openid/openid.module
+++ modules/openid/openid.module
@@ -87,7 +87,7 @@ function openid_form_user_login_alter(&$form, &$form_state) {
 function _openid_user_login_form_alter(&$form, &$form_state) {
   drupal_add_css(drupal_get_path('module', 'openid') . '/openid.css');
   drupal_add_js(drupal_get_path('module', 'openid') . '/openid.js');
-  if (!empty($form_state['post']['openid_identifier'])) {
+  if (!empty($form_state['input']['openid_identifier'])) {
     $form['name']['#required'] = FALSE;
     $form['pass']['#required'] = FALSE;
     unset($form['#submit']);
diff --git modules/openid/openid.pages.inc modules/openid/openid.pages.inc
index adbafd4..e4d7432 100644
--- modules/openid/openid.pages.inc
+++ modules/openid/openid.pages.inc
@@ -88,10 +88,10 @@ function openid_user_delete_form($form_state, $account, $aid = 0) {
 }
 
 function openid_user_delete_form_submit(&$form_state, $form_values) {
-  db_query("DELETE FROM {authmap} WHERE uid = %d AND aid = %d AND module = 'openid'", $form_state['#parameters'][2]->uid, $form_state['#parameters'][3]);
+  db_query("DELETE FROM {authmap} WHERE uid = %d AND aid = %d AND module = 'openid'", $form_state['#args'][0]->uid, $form_state['#args'][1]);
   if (db_affected_rows()) {
     drupal_set_message(t('OpenID deleted.'));
   }
-  $form_state['#redirect'] = 'user/'. $form_state['#parameters'][2]->uid .'/openid';
+  $form_state['#redirect'] = 'user/'. $form_state['#args'][0]->uid .'/openid';
 }
 
diff --git modules/simpletest/tests/form.test modules/simpletest/tests/form.test
index e1bc383..e5fc090 100644
--- modules/simpletest/tests/form.test
+++ modules/simpletest/tests/form.test
@@ -60,8 +60,9 @@ class FormsTestCase extends DrupalWebTestCase {
         $element = $data['element']['#title'];
         $form[$element] = $data['element'];
         $form_state['values'][$element] = $empty;
-        $form['#post'] = $form_state['values'];
-        $form['#post']['form_id'] = $form_id;
+        $form_state['input'] = $form_state['values'];
+        $form_state['input']['form_id'] = $form_id;
+        $form_state['method'] = 'post';
         drupal_prepare_form($form_id, $form, $form_state);
         drupal_process_form($form_id, $form, $form_state);
         $errors = form_get_errors();
@@ -288,13 +289,14 @@ class FormsElementsTableSelectFunctionalTest extends DrupalWebTestCase {
   private function formSubmitHelper($form_element, $edit) {
     $form_id = $this->randomName();
 
-    $form = $form_state = array();
+    $form_state = form_state_defaults();
+    $form = array();
 
     $form = array_merge($form, $form_element);
     $form['op'] = array('#type' => 'submit', '#value' => t('Submit'));
 
-    $form['#post'] = $edit;
-    $form['#post']['form_id'] = $form_id;
+    $form_state['input'] = $edit;
+    $form_state['input']['form_id'] = $form_id;
 
     drupal_prepare_form($form_id, $form, $form_state);
 
diff --git modules/taxonomy/taxonomy.admin.inc modules/taxonomy/taxonomy.admin.inc
index c28731e..08cd5dd 100644
--- modules/taxonomy/taxonomy.admin.inc
+++ modules/taxonomy/taxonomy.admin.inc
@@ -350,13 +350,13 @@ function taxonomy_overview_terms(&$form_state, $vocabulary) {
 
   // If this form was already submitted once, it's probably hit a validation
   // error. Ensure the form is rebuilt in the same order as the user submitted.
-  if (!empty($form_state['post'])) {
-    $order = array_flip(array_keys($form_state['post'])); // Get the $_POST order.
+  if (!empty($form_state['input'])) {
+    $order = array_flip(array_keys($form_state['input'])); // Get the $_POST order.
     $current_page = array_merge($order, $current_page); // Update our form with the new order.
     foreach ($current_page as $key => $term) {
       // Verify this is a term for the current page and set at the current depth.
-      if (is_array($form_state['post'][$key]) && is_numeric($form_state['post'][$key]['tid'])) {
-        $current_page[$key]->depth = $form_state['post'][$key]['depth'];
+      if (is_array($form_state['input'][$key]) && is_numeric($form_state['input'][$key]['tid'])) {
+        $current_page[$key]->depth = $form_state['input'][$key]['depth'];
       }
       else {
         unset($current_page[$key]);
@@ -446,7 +446,7 @@ function taxonomy_overview_terms_submit($form, &$form_state) {
     return;
   }
 
-  $order = array_flip(array_keys($form['#post'])); // Get the $_POST order.
+  $order = array_flip(array_keys($form_state['input'])); // Get the $_POST order.
   $form_state['values'] = array_merge($order, $form_state['values']); // Update our original form with the new order.
 
   $vocabulary = $form['#vocabulary'];
diff --git modules/upload/upload.module modules/upload/upload.module
index 77675fd..b48b396 100644
--- modules/upload/upload.module
+++ modules/upload/upload.module
@@ -689,13 +689,11 @@ function upload_js() {
 
   // Render the form for output.
   $form += array(
-    '#post' => $_POST,
-    '#programmed' => FALSE,
     '#tree' => FALSE,
     '#parents' => array(),
   );
   drupal_alter('form', $form, array(), 'upload_js');
-  $form_state = array('submitted' => FALSE);
+  $form_state = array('submitted' => FALSE, 'programmed' => FALSE);
   $form = form_builder('upload_js', $form, $form_state);
   $output = theme('status_messages') . drupal_render($form);
 
diff --git modules/user/user.module modules/user/user.module
index f4c3658..630faee 100644
--- modules/user/user.module
+++ modules/user/user.module
@@ -2091,7 +2091,7 @@ function user_multiple_role_edit($accounts, $operation, $rid) {
 }
 
 function user_multiple_cancel_confirm(&$form_state) {
-  $edit = $form_state['post'];
+  $edit = $form_state['input'];
 
   $form['accounts'] = array('#prefix' => '<ul>', '#suffix' => '</ul>', '#tree' => TRUE);
   // array_filter() returns only elements with TRUE values.