Preliminary fix for #38 which seems sane.

Some corner case testing for file upload scenarios (multiple files in
one field etc.) needs to be done.