Move crazy submit pre-processing out of buildForm