Cleanup form-data stuff a bit and fix a bug w/ retry+form-data