Got rid of drupal_goto() calls in submit handlers.
Checkpoint 5 completed.