Move batch-form support code back to the form