Update to the improved form handling code.