Clean up the form's code a little bit, to make it more consistantly go through...

Clean up the form's code a little bit, to make it more consistantly go through one code path. Patch from Travis Swicegood.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17381 bcc190cf-cafb-0310-a4f2-bffc1f526a37