diff --git a/source/blender/bmesh/intern/bmesh_opdefines.cc b/source/blender/bmesh/intern/bmesh_opdefines.cc
index 5e703f3e226..2e7208a84eb 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.cc
+++ b/source/blender/bmesh/intern/bmesh_opdefines.cc
@@ -141,7 +141,7 @@ static eBMOpSlotSubType_Union to_subtype_union(const eBMOpSlotSubType_Int intg)
  * Smooths vertices by using a basic vertex averaging scheme.
  */
 static BMOpDefine bmo_smooth_vert_def = {
-    "smooth_vert",
+    /*opname*/ "smooth_vert",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -168,7 +168,7 @@ static BMOpDefine bmo_smooth_vert_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_smooth_vert_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -178,7 +178,7 @@ static BMOpDefine bmo_smooth_vert_def = {
  * Desbrun, et al. Implicit Fairing of Irregular Meshes using Diffusion and Curvature Flow.
  */
 static BMOpDefine bmo_smooth_laplacian_vert_def = {
-    "smooth_laplacian_vert",
+    /*opname*/ "smooth_laplacian_vert",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -201,7 +201,7 @@ static BMOpDefine bmo_smooth_laplacian_vert_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_smooth_laplacian_vert_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -210,7 +210,7 @@ static BMOpDefine bmo_smooth_laplacian_vert_def = {
  * Computes an "outside" normal for the specified input faces.
  */
 static BMOpDefine bmo_recalc_face_normals_def = {
-    "recalc_face_normals",
+    /*opname*/ "recalc_face_normals",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -221,7 +221,7 @@ static BMOpDefine bmo_recalc_face_normals_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_recalc_face_normals_exec,
-    (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -230,7 +230,7 @@ static BMOpDefine bmo_recalc_face_normals_def = {
  * Iteratively flatten faces.
  */
 static BMOpDefine bmo_planar_faces_def = {
-    "planar_faces",
+    /*opname*/ "planar_faces",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -249,7 +249,7 @@ static BMOpDefine bmo_planar_faces_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_planar_faces_exec,
-    (BMO_OPTYPE_FLAG_SELECT_FLUSH | BMO_OPTYPE_FLAG_SELECT_VALIDATE),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_SELECT_FLUSH | BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
 
 /*
@@ -263,7 +263,7 @@ static BMOpDefine bmo_planar_faces_def = {
  * otherwise it spits out faces.
  */
 static BMOpDefine bmo_region_extend_def = {
-    "region_extend",
+    /*opname*/ "region_extend",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -284,7 +284,7 @@ static BMOpDefine bmo_region_extend_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_region_extend_exec,
-    (BMO_OPTYPE_FLAG_SELECT_FLUSH | BMO_OPTYPE_FLAG_SELECT_VALIDATE),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_SELECT_FLUSH | BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
 
 /*
@@ -294,7 +294,7 @@ static BMOpDefine bmo_region_extend_def = {
  * Simple example: `[/] becomes [|] then [\]`.
  */
 static BMOpDefine bmo_rotate_edges_def = {
-    "rotate_edges",
+    /*opname*/ "rotate_edges",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -311,6 +311,7 @@ static BMOpDefine bmo_rotate_edges_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_rotate_edges_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -322,7 +323,7 @@ static BMOpDefine bmo_rotate_edges_def = {
  * This has the effect of flipping the normal.
  */
 static BMOpDefine bmo_reverse_faces_def = {
-    "reverse_faces",
+    /*opname*/ "reverse_faces",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -335,7 +336,7 @@ static BMOpDefine bmo_reverse_faces_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_reverse_faces_exec,
-    (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -344,7 +345,7 @@ static BMOpDefine bmo_reverse_faces_def = {
  * Flip the tessellation direction of the selected quads.
  */
 static BMOpDefine bmo_flip_quad_tessellation_def = {
-    "flip_quad_tessellation",
+    /*opname*/ "flip_quad_tessellation",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -355,7 +356,7 @@ static BMOpDefine bmo_flip_quad_tessellation_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_flip_quad_tessellation_exec,
-    (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -365,7 +366,7 @@ static BMOpDefine bmo_flip_quad_tessellation_def = {
  * This creates a 2-valence vert.
  */
 static BMOpDefine bmo_bisect_edges_def = {
-    "bisect_edges",
+    /*opname*/ "bisect_edges",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -385,6 +386,7 @@ static BMOpDefine bmo_bisect_edges_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_bisect_edges_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -397,7 +399,7 @@ static BMOpDefine bmo_bisect_edges_def = {
  * parameter (which defines the minimum distance for welding to happen).
  */
 static BMOpDefine bmo_mirror_def = {
-    "mirror",
+    /*opname*/ "mirror",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -429,6 +431,7 @@ static BMOpDefine bmo_mirror_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_mirror_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -443,7 +446,7 @@ static BMOpDefine bmo_mirror_def = {
  * with vertices in that set.
  */
 static BMOpDefine bmo_find_doubles_def = {
-    "find_doubles",
+    /*opname*/ "find_doubles",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -463,7 +466,7 @@ static BMOpDefine bmo_find_doubles_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_find_doubles_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -473,7 +476,7 @@ static BMOpDefine bmo_find_doubles_def = {
  * using the weld verts BMOP.
  */
 static BMOpDefine bmo_remove_doubles_def = {
-    "remove_doubles",
+    /*opname*/ "remove_doubles",
     /*slot_types_in*/
     {
         /* Input verts. */
@@ -487,6 +490,7 @@ static BMOpDefine bmo_remove_doubles_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_remove_doubles_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -497,7 +501,7 @@ static BMOpDefine bmo_remove_doubles_def = {
  * Collapses connected vertices
  */
 static BMOpDefine bmo_collapse_def = {
-    "collapse",
+    /*opname*/ "collapse",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -510,6 +514,7 @@ static BMOpDefine bmo_collapse_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_collapse_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -520,7 +525,7 @@ static BMOpDefine bmo_collapse_def = {
  * Merge uv/vcols at a specific vertex.
  */
 static BMOpDefine bmo_pointmerge_facedata_def = {
-    "pointmerge_facedata",
+    /*opname*/ "pointmerge_facedata",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -533,7 +538,7 @@ static BMOpDefine bmo_pointmerge_facedata_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_pointmerge_facedata_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -544,7 +549,7 @@ static BMOpDefine bmo_pointmerge_facedata_def = {
  * the vert_snap_to_bb_center is just too long).
  */
 static BMOpDefine bmo_average_vert_facedata_def = {
-    "average_vert_facedata",
+    /*opname*/ "average_vert_facedata",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -555,7 +560,7 @@ static BMOpDefine bmo_average_vert_facedata_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_average_vert_facedata_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -564,7 +569,7 @@ static BMOpDefine bmo_average_vert_facedata_def = {
  * Merge verts together at a point.
  */
 static BMOpDefine bmo_pointmerge_def = {
-    "pointmerge",
+    /*opname*/ "pointmerge",
     /*slot_types_in*/
     {
         /* Input vertices (all verts will be merged into the first). */
@@ -577,6 +582,7 @@ static BMOpDefine bmo_pointmerge_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_pointmerge_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -587,7 +593,7 @@ static BMOpDefine bmo_pointmerge_def = {
  * Collapses connected UV vertices.
  */
 static BMOpDefine bmo_collapse_uvs_def = {
-    "collapse_uvs",
+    /*opname*/ "collapse_uvs",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -598,7 +604,7 @@ static BMOpDefine bmo_collapse_uvs_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_collapse_uvs_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -609,7 +615,7 @@ static BMOpDefine bmo_collapse_uvs_def = {
  * they weld with.
  */
 static BMOpDefine bmo_weld_verts_def = {
-    "weld_verts",
+    /*opname*/ "weld_verts",
     /*slot_types_in*/
     {
         /* Maps welded vertices to verts they should weld to. */
@@ -620,6 +626,7 @@ static BMOpDefine bmo_weld_verts_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_weld_verts_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -631,7 +638,7 @@ static BMOpDefine bmo_weld_verts_def = {
  * for click-create-vertex.
  */
 static BMOpDefine bmo_create_vert_def = {
-    "create_vert",
+    /*opname*/ "create_vert",
     /*slot_types_in*/
     {
         /* The coordinate of the new vert. */
@@ -646,7 +653,7 @@ static BMOpDefine bmo_create_vert_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_create_vert_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -661,7 +668,7 @@ static BMOpDefine bmo_create_vert_def = {
 #endif
 
 static BMOpDefine bmo_join_triangles_def = {
-    "join_triangles",
+    /*opname*/ "join_triangles",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -694,6 +701,7 @@ static BMOpDefine bmo_join_triangles_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_join_triangles_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -709,7 +717,7 @@ static BMOpDefine bmo_join_triangles_def = {
  * become a wire edge.
  */
 static BMOpDefine bmo_contextual_create_def = {
-    "contextual_create",
+    /*opname*/ "contextual_create",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -734,6 +742,7 @@ static BMOpDefine bmo_contextual_create_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_contextual_create_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -742,7 +751,7 @@ static BMOpDefine bmo_contextual_create_def = {
  * Bridge edge loops with faces.
  */
 static BMOpDefine bmo_bridge_loops_def = {
-    "bridge_loops",
+    /*opname*/ "bridge_loops",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -767,6 +776,7 @@ static BMOpDefine bmo_bridge_loops_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_bridge_loops_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -777,7 +787,7 @@ static BMOpDefine bmo_bridge_loops_def = {
  * Create faces defined by 2 disconnected edge loops (which share edges).
  */
 static BMOpDefine bmo_grid_fill_def = {
-    "grid_fill",
+    /*opname*/ "grid_fill",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -802,7 +812,7 @@ static BMOpDefine bmo_grid_fill_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_grid_fill_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -811,7 +821,7 @@ static BMOpDefine bmo_grid_fill_def = {
  * Fill boundary edges with faces, copying surrounding custom-data.
  */
 static BMOpDefine bmo_holes_fill_def = {
-    "holes_fill",
+    /*opname*/ "holes_fill",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -828,7 +838,7 @@ static BMOpDefine bmo_holes_fill_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_holes_fill_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -837,7 +847,7 @@ static BMOpDefine bmo_holes_fill_def = {
  * Fill in faces with data from adjacent faces.
  */
 static BMOpDefine bmo_face_attribute_fill_def = {
-    "face_attribute_fill",
+    /*opname*/ "face_attribute_fill",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -856,7 +866,7 @@ static BMOpDefine bmo_face_attribute_fill_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_face_attribute_fill_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -865,7 +875,7 @@ static BMOpDefine bmo_face_attribute_fill_def = {
  * Create faces defined by one or more non overlapping edge loops.
  */
 static BMOpDefine bmo_edgeloop_fill_def = {
-    "edgeloop_fill",
+    /*opname*/ "edgeloop_fill",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -887,7 +897,7 @@ static BMOpDefine bmo_edgeloop_fill_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_edgeloop_fill_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -896,7 +906,7 @@ static BMOpDefine bmo_edgeloop_fill_def = {
  * Create faces defined by enclosed edges.
  */
 static BMOpDefine bmo_edgenet_fill_def = {
-    "edgenet_fill",
+    /*opname*/ "edgenet_fill",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -917,7 +927,7 @@ static BMOpDefine bmo_edgenet_fill_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_edgenet_fill_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -931,7 +941,7 @@ static BMOpDefine bmo_edgenet_fill_def = {
  *   shortest distance between each endpoint).
  */
 static BMOpDefine bmo_edgenet_prepare_def = {
-    "edgenet_prepare",
+    /*opname*/ "edgenet_prepare",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -946,7 +956,7 @@ static BMOpDefine bmo_edgenet_prepare_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_edgenet_prepare_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -955,7 +965,7 @@ static BMOpDefine bmo_edgenet_prepare_def = {
  * Rotate vertices around a center, using a 3x3 rotation matrix.
  */
 static BMOpDefine bmo_rotate_def = {
-    "rotate",
+    /*opname*/ "rotate",
     /*slot_types_in*/
     {
         /* Center of rotation. */
@@ -974,7 +984,7 @@ static BMOpDefine bmo_rotate_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_rotate_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -983,7 +993,7 @@ static BMOpDefine bmo_rotate_def = {
  * Translate vertices by an offset.
  */
 static BMOpDefine bmo_translate_def = {
-    "translate",
+    /*opname*/ "translate",
     /*slot_types_in*/
     {
         /* Translation offset. */
@@ -1000,7 +1010,7 @@ static BMOpDefine bmo_translate_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_translate_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -1009,7 +1019,7 @@ static BMOpDefine bmo_translate_def = {
  * Scales vertices by an offset.
  */
 static BMOpDefine bmo_scale_def = {
-    "scale",
+    /*opname*/ "scale",
     /*slot_types_in*/
     {
         /* Scale factor. */
@@ -1026,7 +1036,7 @@ static BMOpDefine bmo_scale_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_scale_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -1036,7 +1046,7 @@ static BMOpDefine bmo_scale_def = {
  * the vertex coordinates with the matrix.
  */
 static BMOpDefine bmo_transform_def = {
-    "transform",
+    /*opname*/ "transform",
     /*slot_types_in*/
     {
         /* Transform matrix. */
@@ -1053,7 +1063,7 @@ static BMOpDefine bmo_transform_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_transform_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -1063,7 +1073,7 @@ static BMOpDefine bmo_transform_def = {
  * BMOP.
  */
 static BMOpDefine bmo_object_load_bmesh_def = {
-    "object_load_bmesh",
+    /*opname*/ "object_load_bmesh",
     /*slot_types_in*/
     {
         /* Pointer to an scene structure. */
@@ -1077,7 +1087,7 @@ static BMOpDefine bmo_object_load_bmesh_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_object_load_bmesh_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -1086,7 +1096,7 @@ static BMOpDefine bmo_object_load_bmesh_def = {
  * Converts a bmesh to a Mesh. This is reserved for exiting edit-mode.
  */
 static BMOpDefine bmo_bmesh_to_mesh_def = {
-    "bmesh_to_mesh",
+    /*opname*/ "bmesh_to_mesh",
     /*slot_types_in*/
     {
 
@@ -1100,7 +1110,7 @@ static BMOpDefine bmo_bmesh_to_mesh_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_bmesh_to_mesh_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -1110,7 +1120,7 @@ static BMOpDefine bmo_bmesh_to_mesh_def = {
  * reserved exclusively for entering edit-mode.
  */
 static BMOpDefine bmo_mesh_to_bmesh_def = {
-    "mesh_to_bmesh",
+    /*opname*/ "mesh_to_bmesh",
     /*slot_types_in*/
     {
         /* Pointer to a Mesh structure. */
@@ -1125,7 +1135,7 @@ static BMOpDefine bmo_mesh_to_bmesh_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_mesh_to_bmesh_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -1134,7 +1144,7 @@ static BMOpDefine bmo_mesh_to_bmesh_def = {
  * Extrudes faces individually.
  */
 static BMOpDefine bmo_extrude_discrete_faces_def = {
-    "extrude_discrete_faces",
+    /*opname*/ "extrude_discrete_faces",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -1153,7 +1163,7 @@ static BMOpDefine bmo_extrude_discrete_faces_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_extrude_discrete_faces_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -1163,7 +1173,7 @@ static BMOpDefine bmo_extrude_discrete_faces_def = {
  * winged extrusion.
  */
 static BMOpDefine bmo_extrude_edge_only_def = {
-    "extrude_edge_only",
+    /*opname*/ "extrude_edge_only",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -1182,7 +1192,7 @@ static BMOpDefine bmo_extrude_edge_only_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_extrude_edge_only_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -1191,7 +1201,7 @@ static BMOpDefine bmo_extrude_edge_only_def = {
  * Extrudes wire edges from vertices.
  */
 static BMOpDefine bmo_extrude_vert_indiv_def = {
-    "extrude_vert_indiv",
+    /*opname*/ "extrude_vert_indiv",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -1210,7 +1220,7 @@ static BMOpDefine bmo_extrude_vert_indiv_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_extrude_vert_indiv_exec,
-    (BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -1219,7 +1229,7 @@ static BMOpDefine bmo_extrude_vert_indiv_def = {
  * Split faces by adding edges that connect **verts**.
  */
 static BMOpDefine bmo_connect_verts_def = {
-    "connect_verts",
+    /*opname*/ "connect_verts",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -1237,6 +1247,7 @@ static BMOpDefine bmo_connect_verts_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_connect_verts_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
@@ -1246,7 +1257,7 @@ static BMOpDefine bmo_connect_verts_def = {
  * Ensures all faces are convex **faces**.
  */
 static BMOpDefine bmo_connect_verts_concave_def = {
-    "connect_verts_concave",
+    /*opname*/ "connect_verts_concave",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -1261,6 +1272,7 @@ static BMOpDefine bmo_connect_verts_concave_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_connect_verts_concave_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
@@ -1270,7 +1282,7 @@ static BMOpDefine bmo_connect_verts_concave_def = {
  * Split faces by connecting edges along non planer **faces**.
  */
 static BMOpDefine bmo_connect_verts_nonplanar_def = {
-    "connect_verts_nonplanar",
+    /*opname*/ "connect_verts_nonplanar",
     /*slot_types_in*/
     {
         /* Total rotation angle (radians). */
@@ -1287,6 +1299,7 @@ static BMOpDefine bmo_connect_verts_nonplanar_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_connect_verts_nonplanar_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
@@ -1296,7 +1309,7 @@ static BMOpDefine bmo_connect_verts_nonplanar_def = {
  * Split faces by adding edges that connect **verts**.
  */
 static BMOpDefine bmo_connect_vert_pair_def = {
-    "connect_vert_pair",
+    /*opname*/ "connect_vert_pair",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -1314,6 +1327,7 @@ static BMOpDefine bmo_connect_vert_pair_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_connect_vert_pair_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
@@ -1323,7 +1337,7 @@ static BMOpDefine bmo_connect_vert_pair_def = {
  * Extrude operator (does not transform)
  */
 static BMOpDefine bmo_extrude_face_region_def = {
-    "extrude_face_region",
+    /*opname*/ "extrude_face_region",
     /*slot_types_in*/
     {
         /* Edges and faces. */
@@ -1349,14 +1363,14 @@ static BMOpDefine bmo_extrude_face_region_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_extrude_face_region_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
  * Dissolve Verts.
  */
 static BMOpDefine bmo_dissolve_verts_def = {
-    "dissolve_verts",
+    /*opname*/ "dissolve_verts",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -1371,6 +1385,7 @@ static BMOpDefine bmo_dissolve_verts_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_dissolve_verts_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -1379,7 +1394,7 @@ static BMOpDefine bmo_dissolve_verts_def = {
  * Dissolve Edges.
  */
 static BMOpDefine bmo_dissolve_edges_def = {
-    "dissolve_edges",
+    /*opname*/ "dissolve_edges",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -1400,6 +1415,7 @@ static BMOpDefine bmo_dissolve_edges_def = {
     },
     /*init*/ bmo_dissolve_edges_init,
     /*exec*/ bmo_dissolve_edges_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -1408,7 +1424,7 @@ static BMOpDefine bmo_dissolve_edges_def = {
  * Dissolve Faces.
  */
 static BMOpDefine bmo_dissolve_faces_def = {
-    "dissolve_faces",
+    /*opname*/ "dissolve_faces",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -1424,6 +1440,7 @@ static BMOpDefine bmo_dissolve_faces_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_dissolve_faces_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -1443,7 +1460,7 @@ static BMO_FlagSet bmo_enum_dissolve_limit_flags[] = {
  * Dissolve planar faces and co-linear edges.
  */
 static BMOpDefine bmo_dissolve_limit_def = {
-    "dissolve_limit",
+    /*opname*/ "dissolve_limit",
     /*slot_types_in*/
     {
         /* Total rotation angle (radians). */
@@ -1468,6 +1485,7 @@ static BMOpDefine bmo_dissolve_limit_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_dissolve_limit_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -1478,7 +1496,7 @@ static BMOpDefine bmo_dissolve_limit_def = {
  * Dissolve edges with no length, faces with no area.
  */
 static BMOpDefine bmo_dissolve_degenerate_def = {
-    "dissolve_degenerate",
+    /*opname*/ "dissolve_degenerate",
     /*slot_types_in*/
     {
         /* Maximum distance to consider degenerate. */
@@ -1491,6 +1509,7 @@ static BMOpDefine bmo_dissolve_degenerate_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_dissolve_degenerate_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -1514,7 +1533,7 @@ static BMO_FlagSet bmo_enum_triangulate_ngon_method[] = {
  * Triangulate.
  */
 static BMOpDefine bmo_triangulate_def = {
-    "triangulate",
+    /*opname*/ "triangulate",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -1546,6 +1565,7 @@ static BMOpDefine bmo_triangulate_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_triangulate_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
@@ -1555,7 +1575,7 @@ static BMOpDefine bmo_triangulate_def = {
  * Reduce detail in geometry containing grids.
  */
 static BMOpDefine bmo_unsubdivide_def = {
-    "unsubdivide",
+    /*opname*/ "unsubdivide",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -1568,6 +1588,7 @@ static BMOpDefine bmo_unsubdivide_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_unsubdivide_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -1587,7 +1608,7 @@ static BMO_FlagSet bmo_enum_subdivide_edges_quad_corner_type[] = {
  * with options for face patterns, smoothing and randomization.
  */
 static BMOpDefine bmo_subdivide_edges_def = {
-    "subdivide_edges",
+    /*opname*/ "subdivide_edges",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -1640,6 +1661,7 @@ static BMOpDefine bmo_subdivide_edges_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_subdivide_edges_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -1657,7 +1679,7 @@ static BMO_FlagSet bmo_enum_subdivide_edgering_interp_mode[] = {
  * Take an edge-ring, and subdivide with interpolation options.
  */
 static BMOpDefine bmo_subdivide_edgering_def = {
-    "subdivide_edgering",
+    /*opname*/ "subdivide_edgering",
     /*slot_types_in*/
     {
         /* Input vertices. */
@@ -1688,6 +1710,7 @@ static BMOpDefine bmo_subdivide_edgering_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_subdivide_edgering_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -1698,7 +1721,7 @@ static BMOpDefine bmo_subdivide_edgering_def = {
  * Bisects the mesh by a plane (cut the mesh in half).
  */
 static BMOpDefine bmo_bisect_plane_def = {
-    "bisect_plane",
+    /*opname*/ "bisect_plane",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -1727,6 +1750,7 @@ static BMOpDefine bmo_bisect_plane_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_bisect_plane_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -1748,7 +1772,7 @@ static BMO_FlagSet bmo_enum_delete_context[] = {
  * Utility operator to delete geometry.
  */
 static BMOpDefine bmo_delete_def = {
-    "delete",
+    /*opname*/ "delete",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -1764,6 +1788,7 @@ static BMOpDefine bmo_delete_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_delete_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -1775,7 +1800,7 @@ static BMOpDefine bmo_delete_def = {
  * optionally into a destination mesh.
  */
 static BMOpDefine bmo_duplicate_def = {
-    "duplicate",
+    /*opname*/ "duplicate",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -1813,7 +1838,7 @@ static BMOpDefine bmo_duplicate_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_duplicate_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -1823,7 +1848,7 @@ static BMOpDefine bmo_duplicate_def = {
  * optionally into a destination mesh.
  */
 static BMOpDefine bmo_split_def = {
-    "split",
+    /*opname*/ "split",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -1847,7 +1872,7 @@ static BMOpDefine bmo_split_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_split_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -1857,7 +1882,7 @@ static BMOpDefine bmo_split_def = {
  * rotating and possibly translating after each step
  */
 static BMOpDefine bmo_spin_def = {
-    "spin",
+    /*opname*/ "spin",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -1890,7 +1915,7 @@ static BMOpDefine bmo_spin_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_spin_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -1899,7 +1924,7 @@ static BMOpDefine bmo_spin_def = {
  * Cycle the loop UVs
  */
 static BMOpDefine bmo_rotate_uvs_def = {
-    "rotate_uvs",
+    /*opname*/ "rotate_uvs",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -1912,7 +1937,7 @@ static BMOpDefine bmo_rotate_uvs_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_rotate_uvs_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -1921,7 +1946,7 @@ static BMOpDefine bmo_rotate_uvs_def = {
  * Reverse the UVs
  */
 static BMOpDefine bmo_reverse_uvs_def = {
-    "reverse_uvs",
+    /*opname*/ "reverse_uvs",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -1932,7 +1957,7 @@ static BMOpDefine bmo_reverse_uvs_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_reverse_uvs_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -1941,7 +1966,7 @@ static BMOpDefine bmo_reverse_uvs_def = {
  * Cycle the loop colors
  */
 static BMOpDefine bmo_rotate_colors_def = {
-    "rotate_colors",
+    /*opname*/ "rotate_colors",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -1956,7 +1981,7 @@ static BMOpDefine bmo_rotate_colors_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_rotate_colors_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -1965,7 +1990,7 @@ static BMOpDefine bmo_rotate_colors_def = {
  * Reverse the loop colors.
  */
 static BMOpDefine bmo_reverse_colors_def = {
-    "reverse_colors",
+    /*opname*/ "reverse_colors",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -1978,7 +2003,7 @@ static BMOpDefine bmo_reverse_colors_def = {
     {{{'\0'}}},
     /*init*/ nullptr,
     /*exec*/ bmo_reverse_colors_exec,
-    (BMO_OPTYPE_FLAG_NOP),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NOP),
 };
 
 /*
@@ -1987,7 +2012,7 @@ static BMOpDefine bmo_reverse_colors_def = {
  * Disconnects faces along input edges.
  */
 static BMOpDefine bmo_split_edges_def = {
-    "split_edges",
+    /*opname*/ "split_edges",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -2010,6 +2035,7 @@ static BMOpDefine bmo_split_edges_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_split_edges_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
@@ -2019,7 +2045,7 @@ static BMOpDefine bmo_split_edges_def = {
  * Creates a grid with a variable number of subdivisions
  */
 static BMOpDefine bmo_create_grid_def = {
-    "create_grid",
+    /*opname*/ "create_grid",
     /*slot_types_in*/
     {
         /* Number of x segments. */
@@ -2042,7 +2068,7 @@ static BMOpDefine bmo_create_grid_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_create_grid_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -2051,7 +2077,7 @@ static BMOpDefine bmo_create_grid_def = {
  * Creates a grid with a variable number of subdivisions
  */
 static BMOpDefine bmo_create_uvsphere_def = {
-    "create_uvsphere",
+    /*opname*/ "create_uvsphere",
     /*slot_types_in*/
     {
         /* Number of u segments. */
@@ -2074,7 +2100,7 @@ static BMOpDefine bmo_create_uvsphere_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_create_uvsphere_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -2083,7 +2109,7 @@ static BMOpDefine bmo_create_uvsphere_def = {
  * Creates a grid with a variable number of subdivisions
  */
 static BMOpDefine bmo_create_icosphere_def = {
-    "create_icosphere",
+    /*opname*/ "create_icosphere",
     /*slot_types_in*/
     {
         /* How many times to recursively subdivide the sphere. */
@@ -2104,7 +2130,7 @@ static BMOpDefine bmo_create_icosphere_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_create_icosphere_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -2113,7 +2139,7 @@ static BMOpDefine bmo_create_icosphere_def = {
  * Creates a monkey (standard blender primitive).
  */
 static BMOpDefine bmo_create_monkey_def = {
-    "create_monkey",
+    /*opname*/ "create_monkey",
     /*slot_types_in*/
     {
         /* Matrix to multiply the new geometry with. */
@@ -2130,7 +2156,7 @@ static BMOpDefine bmo_create_monkey_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_create_monkey_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -2139,7 +2165,7 @@ static BMOpDefine bmo_create_monkey_def = {
  * Creates a cone with variable depth at both ends
  */
 static BMOpDefine bmo_create_cone_def = {
-    "create_cone",
+    /*opname*/ "create_cone",
     /*slot_types_in*/
     {
         /* Whether or not to fill in the ends with faces. */
@@ -2168,14 +2194,14 @@ static BMOpDefine bmo_create_cone_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_create_cone_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
  * Creates a Circle.
  */
 static BMOpDefine bmo_create_circle_def = {
-    "create_circle",
+    /*opname*/ "create_circle",
     /*slot_types_in*/
     {
         /* Whether or not to fill in the ends with faces. */
@@ -2200,7 +2226,7 @@ static BMOpDefine bmo_create_circle_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_create_circle_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -2209,7 +2235,7 @@ static BMOpDefine bmo_create_circle_def = {
  * Creates a cube.
  */
 static BMOpDefine bmo_create_cube_def = {
-    "create_cube",
+    /*opname*/ "create_cube",
     /*slot_types_in*/
     {
         /* Size of the cube. */
@@ -2228,7 +2254,7 @@ static BMOpDefine bmo_create_cube_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_create_cube_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 static BMO_FlagSet bmo_enum_bevel_offset_type[] = {
@@ -2279,7 +2305,7 @@ static BMO_FlagSet bmo_enum_bevel_affect_type[] = {
  * Bevels edges and vertices
  */
 static BMOpDefine bmo_bevel_def = {
-    "bevel",
+    /*opname*/ "bevel",
     /*slot_types_in*/
     {
         /* Input edges and vertices. */
@@ -2356,6 +2382,7 @@ static BMOpDefine bmo_bevel_def = {
 
     /*init*/ nullptr,
     /*exec*/ bmo_bevel_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -2373,7 +2400,7 @@ static BMO_FlagSet bmo_enum_beautify_fill_method[] = {
  * Rotate edges to create more evenly spaced triangles.
  */
 static BMOpDefine bmo_beautify_fill_def = {
-    "beautify_fill",
+    /*opname*/ "beautify_fill",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -2397,6 +2424,7 @@ static BMOpDefine bmo_beautify_fill_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_beautify_fill_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -2407,7 +2435,7 @@ static BMOpDefine bmo_beautify_fill_def = {
  * Fill edges with triangles
  */
 static BMOpDefine bmo_triangle_fill_def = {
-    "triangle_fill",
+    /*opname*/ "triangle_fill",
     /*slot_types_in*/
     {
         /* Use best triangulation division. */
@@ -2428,6 +2456,7 @@ static BMOpDefine bmo_triangle_fill_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_triangle_fill_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
@@ -2437,7 +2466,7 @@ static BMOpDefine bmo_triangle_fill_def = {
  * Turns a mesh into a shell with thickness
  */
 static BMOpDefine bmo_solidify_def = {
-    "solidify",
+    /*opname*/ "solidify",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -2453,7 +2482,7 @@ static BMOpDefine bmo_solidify_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_solidify_face_region_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -2462,7 +2491,7 @@ static BMOpDefine bmo_solidify_def = {
  * Insets individual faces.
  */
 static BMOpDefine bmo_inset_individual_def = {
-    "inset_individual",
+    /*opname*/ "inset_individual",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -2488,7 +2517,7 @@ static BMOpDefine bmo_inset_individual_def = {
     /*init*/ nullptr,
     /*exec*/ bmo_inset_individual_exec,
     /* Caller needs to handle BMO_OPTYPE_FLAG_SELECT_FLUSH. */
-    (BMO_OPTYPE_FLAG_NORMALS_CALC),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC),
 };
 
 /*
@@ -2497,7 +2526,7 @@ static BMOpDefine bmo_inset_individual_def = {
  * Inset or outset face regions.
  */
 static BMOpDefine bmo_inset_region_def = {
-    "inset_region",
+    /*opname*/ "inset_region",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -2530,7 +2559,7 @@ static BMOpDefine bmo_inset_region_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_inset_region_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -2539,7 +2568,7 @@ static BMOpDefine bmo_inset_region_def = {
  * Creates edge loops based on simple edge-outset method.
  */
 static BMOpDefine bmo_offset_edgeloops_def = {
-    "offset_edgeloops",
+    /*opname*/ "offset_edgeloops",
     /*slot_types_in*/
     {
         /* Input edges. */
@@ -2556,7 +2585,7 @@ static BMOpDefine bmo_offset_edgeloops_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_offset_edgeloops_exec,
-    (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
+    /*type_flag*/ (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH),
 };
 
 /*
@@ -2565,7 +2594,7 @@ static BMOpDefine bmo_offset_edgeloops_def = {
  * Makes a wire-frame copy of faces.
  */
 static BMOpDefine bmo_wireframe_def = {
-    "wireframe",
+    /*opname*/ "wireframe",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -2598,6 +2627,7 @@ static BMOpDefine bmo_wireframe_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_wireframe_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -2615,7 +2645,7 @@ static BMO_FlagSet bmo_enum_poke_center_mode[] = {
  * Splits a face into a triangle fan.
  */
 static BMOpDefine bmo_poke_def = {
-    "poke",
+    /*opname*/ "poke",
     /*slot_types_in*/
     {
         /* Input faces. */
@@ -2641,6 +2671,7 @@ static BMOpDefine bmo_poke_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_poke_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -2662,7 +2693,7 @@ static BMOpDefine bmo_poke_def = {
  * that were in the input and are part of the hull.
  */
 static BMOpDefine bmo_convex_hull_def = {
-    "convex_hull",
+    /*opname*/ "convex_hull",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -2681,6 +2712,7 @@ static BMOpDefine bmo_convex_hull_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_convex_hull_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };
@@ -2697,7 +2729,7 @@ static BMOpDefine bmo_convex_hull_def = {
  * All new vertices, edges, and faces are added to the "geom.out" slot.
  */
 static BMOpDefine bmo_symmetrize_def = {
-    "symmetrize",
+    /*opname*/ "symmetrize",
     /*slot_types_in*/
     {
         /* Input geometry. */
@@ -2720,6 +2752,7 @@ static BMOpDefine bmo_symmetrize_def = {
     },
     /*init*/ nullptr,
     /*exec*/ bmo_symmetrize_exec,
+    /*type_flag*/
     (BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH |
      BMO_OPTYPE_FLAG_SELECT_VALIDATE),
 };