More form upload tinkering.