I don't like the removal of all these $form variables.