diff --git a/src/medit.c b/src/medit.c
index 67dac3b..79bdcb8 100644
--- a/src/medit.c
+++ b/src/medit.c
@@ -669,7 +669,7 @@ void medit_parse(struct descriptor_data *d, char *arg)
     if ((i = atoi(arg)) <= 0)
       break;
     else if (i <= NUM_MOB_FLAGS)
-      TOGGLE_BIT_AR(MOB_FLAGS(OLC_MOB(d)), 1 << (i - 1));
+      TOGGLE_BIT_AR(MOB_FLAGS(OLC_MOB(d)), (i - 1));
     medit_disp_mob_flags(d);
     return;
 
@@ -677,7 +677,7 @@ void medit_parse(struct descriptor_data *d, char *arg)
     if ((i = atoi(arg)) <= 0)
       break;
     else if (i <= NUM_AFF_FLAGS)
-      TOGGLE_BIT_AR(AFF_FLAGS(OLC_MOB(d)), 1 << (i - 1));
+      TOGGLE_BIT_AR(AFF_FLAGS(OLC_MOB(d)), i);
 
     /* Remove unwanted bits right away. */
     REMOVE_BIT_AR(AFF_FLAGS(OLC_MOB(d)), AFF_CHARM | AFF_POISON | AFF_GROUP | AFF_SLEEP);
diff --git a/src/oedit.c b/src/oedit.c
index 09d5248..e18d69d 100644
--- a/src/oedit.c
+++ b/src/oedit.c
@@ -889,7 +889,7 @@ void oedit_parse(struct descriptor_data *d, char *arg)
     } else if (number == 0)
       break;
     else {
-      TOGGLE_BIT_AR(GET_OBJ_EXTRA(OLC_OBJ(d)), 1 << (number - 1));
+      TOGGLE_BIT_AR(GET_OBJ_EXTRA(OLC_OBJ(d)), (number - 1));
       oedit_disp_extra_menu(d);
       return;
     }
@@ -903,7 +903,7 @@ void oedit_parse(struct descriptor_data *d, char *arg)
     } else if (number == 0)	/* Quit. */
       break;
     else {
-      TOGGLE_BIT_AR(GET_OBJ_WEAR(OLC_OBJ(d)), 1 << (number - 1));
+      TOGGLE_BIT_AR(GET_OBJ_WEAR(OLC_OBJ(d)), (number - 1));
       oedit_disp_wear_menu(d);
       return;
     }
@@ -981,7 +981,7 @@ void oedit_parse(struct descriptor_data *d, char *arg)
       if (number < 0 || number > 4)
 	oedit_disp_container_flags_menu(d);
       else if (number != 0) {
-        TOGGLE_BIT(GET_OBJ_VAL(OLC_OBJ(d), 1), 1 << (number - 1));
+        TOGGLE_BIT(GET_OBJ_VAL(OLC_OBJ(d), 1), (number - 1));
         OLC_VAL(d) = 1;
 	oedit_disp_val2_menu(d);
       } else
diff --git a/src/redit.c b/src/redit.c
index cfd943b..86f158f 100644
--- a/src/redit.c
+++ b/src/redit.c
@@ -611,7 +611,7 @@ void redit_parse(struct descriptor_data *d, char *arg)
       break;
     else {
       /* Toggle the bit. */
-      TOGGLE_BIT_AR(OLC_ROOM(d)->room_flags, 1 << (number - 1));
+      TOGGLE_BIT_AR(OLC_ROOM(d)->room_flags, number - 1);
       redit_disp_flag_menu(d);
     }
     return;