Extract form objects from the persistence objects

Can this use `terms` instead of `Forms::BatchEditForm.terms`?