Refactor the aggregation of forms and collections in FormModel.