Max&Sam: Split generic form logic from the rp2 form.