MP-363 #comment Fix up the form. Almost everything is passed through by the form definition now.