Clean up some form handling.