diff --git a/src/lib/rewrites.ml b/src/lib/rewrites.ml
index 328705d0e..b91f48014 100644
--- a/src/lib/rewrites.ml
+++ b/src/lib/rewrites.ml
@@ -4328,8 +4328,9 @@ let rewrite_unroll_constant_loops _type_env defs =
     A type-checking pass is expected to be run after this rewrite. *)
 let remove_bitfield_records type_env =
   let rewrite_def rewriters = function
-    | DEF_aux (DEF_type (TD_aux (TD_record (id, tq, _, _), t_annot)), def_annot) when Env.is_bitfield id type_env ->
-        let typ, _ = Env.get_bitfield id type_env in
+    (* Avoid using Env.get_bitfield in case the typing environment is out of date (e.g., due to nexp_ids) *)
+    | DEF_aux (DEF_type (TD_aux (TD_record (id, tq, [(typ, _)], _), t_annot)), def_annot)
+      when Env.is_bitfield id type_env ->
         DEF_aux (DEF_type (TD_aux (TD_abbrev (id, tq, mk_typ_arg (A_typ typ)), t_annot)), def_annot)
     | d -> rewriters_base.rewrite_def rewriters d
   in
diff --git a/src/lib/type_check.ml b/src/lib/type_check.ml
index 88d344822..98c65c0e4 100644
--- a/src/lib/type_check.ml
+++ b/src/lib/type_check.ml
@@ -4790,8 +4790,11 @@ let check_record l env def_annot id typq fields =
   let env =
     try
       match get_def_attribute "bitfield" def_annot with
-      | Some (_, Some (AD_aux (AD_num size, _))) when not (Env.is_bitfield id env) ->
-          Env.add_bitfield id (bitvector_typ (nconstant size)) Bindings.empty env
+      | Some _ when not (Env.is_bitfield id env) -> begin
+          match fields with
+          | [(typ, Id_aux (Id "bits", _))] -> Env.add_bitfield id typ Bindings.empty env
+          | _ -> typ_raise l (Err_other "bitfield record has wrong fields")
+        end
       | _ -> env
     with _ -> env
   in
@@ -4957,9 +4960,7 @@ let rec check_typedef : Env.t -> env def_annot -> uannot type_def -> typed_def l
                      This is used as the default name for all the bits in the bitfield, so should not be overridden."
               )
               ranges;
-            (*
-                let def_annot = add_def_attribute l "bitfield" (Some (AD_aux (AD_num size, l))) def_annot in
-                   *)
+            let def_annot = add_def_attribute l "bitfield" None def_annot in
             let defs =
               DEF_aux (DEF_type (TD_aux (record_tdef, (l, empty_uannot))), strip_def_annot def_annot)
               :: Bitfield.macro id size (Env.get_default_order env) ranges