diff --git a/src/language.ml b/src/language.ml
index c9d04dd2c3fae5c2423a286cb8f03bc4e02f5898..722b15a59f91b9170a375fe0b9ed989276e68492 100644
--- a/src/language.ml
+++ b/src/language.ml
@@ -58,7 +58,7 @@ let register_nn_as_tuple nb_inputs nb_outputs filename nier env =
       (Ty.ty_tuple (List.init nb_outputs ~f))
   in
   Term.Hls.add loaded_nets ls_net_apply
-  { filename; nb_inputs; nb_outputs; ty_data = input_type; nier };
+    { filename; nb_inputs; nb_outputs; ty_data = input_type; nier };
   let th_uc =
     Pmodule.add_pdecl ~vc:false th_uc
       (Pdecl.create_pure_decl (Decl.create_param_decl ls_net_apply))
@@ -87,22 +87,23 @@ let nnet_parser env _ filename _ =
   let model = Nnet.parse ~permissive:true filename in
   match model with
   | Error s -> Loc.errorm "%s" s
-  | Ok model ->
-    register_nn_as_tuple model.n_inputs model.n_outputs filename None env
+  | Ok { n_inputs; n_outputs; _ } ->
+    register_nn_as_tuple n_inputs n_outputs filename None env
 
 let onnx_parser env _ filename _ =
   let model = Onnx.parse filename in
   match model with
   | Error s -> Loc.errorm "%s" s
-  | Ok (model, nier) ->
-    register_nn_as_tuple model.n_inputs model.n_outputs filename (Some nier) env
+  | Ok { n_inputs; n_outputs; nier } ->
+    let nier = Result.ok nier (* TODO: Warn about parsing errors? *) in
+    register_nn_as_tuple n_inputs n_outputs filename nier env
 
 let ovo_parser env _ filename _ =
   let model = Ovo.parse filename in
   match model with
   | Error s -> Loc.errorm "%s" s
-  | Ok model ->
-    register_svm_as_array model.n_inputs model.n_outputs filename env
+  | Ok { n_inputs; n_outputs } ->
+    register_svm_as_array n_inputs n_outputs filename env
 
 let register_nnet_support () =
   Env.register_format ~desc:"NNet format (ReLU only)" Pmodule.mlw_language