diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index ba13cdb026..ed3127a413 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -53,22 +53,22 @@
 		return
 
 	var/list/modifiers = params2list(params)
-	if(LAZYACCESS(modifiers, SHIFT_CLICK) && modifiers["middle"])
+	if(LAZYACCESS(modifiers, SHIFT_CLICK) && LAZYACCESS(modifiers, MIDDLE_CLICK))
 		return ShiftMiddleClickOn(A, params)
 	if(LAZYACCESS(modifiers, SHIFT_CLICK) && LAZYACCESS(modifiers, CTRL_CLICK))
 		return CtrlShiftClickOn(A)
-	if(modifiers["middle"])
+	if(LAZYACCESS(modifiers, MIDDLE_CLICK))
 		return MiddleClickOn(A)
-	if(LAZYACCESS(modifiers, SHIFT_CLICK) && (client && client.show_popup_menus || modifiers["right"])) //CIT CHANGE - makes shift-click examine use right click instead of left click in combat mode
+	if(LAZYACCESS(modifiers, SHIFT_CLICK) && (client && client.show_popup_menus || LAZYACCESS(modifiers, RIGHT_CLICK))) //CIT CHANGE - makes shift-click examine use right click instead of left click in combat mode
 		return ShiftClickOn(A)
 	if(LAZYACCESS(modifiers, ALT_CLICK)) // alt and alt-gr (rightalt)
 		return AltClickOn(A)
-	if(LAZYACCESS(modifiers, CTRL_CLICK) && modifiers["right"]) //CIT CHANGE - right click ctrl for a new form of dropping items
+	if(LAZYACCESS(modifiers, CTRL_CLICK) && LAZYACCESS(modifiers, RIGHT_CLICK)) //CIT CHANGE - right click ctrl for a new form of dropping items
 		return CtrlRightClickOn(A, params) //CIT CHANGE
 	if(LAZYACCESS(modifiers, CTRL_CLICK))
 		return CtrlClickOn(A)
 
-	if(modifiers["right"]) //CIT CHANGE - allows right clicking to perform actions
+	if(LAZYACCESS(modifiers, RIGHT_CLICK)) //CIT CHANGE - allows right clicking to perform actions
 		return RightClickOn(A, params) //CIT CHANGE - ditto
 
 	if(incapacitated(ignore_restraints = 1))
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 47b25beded..ff575d0d4f 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -16,9 +16,9 @@
 	var/list/modifiers = params2list(params)
 	if(LAZYACCESS(modifiers, SHIFT_CLICK) && LAZYACCESS(modifiers, CTRL_CLICK))
 		return CtrlShiftClickOn(A)
-	if(LAZYACCESS(modifiers, SHIFT_CLICK) && modifiers["middle"])
+	if(LAZYACCESS(modifiers, SHIFT_CLICK) && LAZYACCESS(modifiers, MIDDLE_CLICK))
 		return ShiftMiddleClickOn(A)
-	if(modifiers["middle"])
+	if(LAZYACCESS(modifiers, MIDDLE_CLICK))
 		return MiddleClickOn(A)
 	if(LAZYACCESS(modifiers, SHIFT_CLICK))
 		return ShiftClickOn(A)
diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index 95e013da75..22b21382c7 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -17,13 +17,13 @@
 		return
 
 	var/list/modifiers = params2list(params)
-	if(LAZYACCESS(modifiers, SHIFT_CLICK) && modifiers["middle"])
+	if(LAZYACCESS(modifiers, SHIFT_CLICK) && LAZYACCESS(modifiers, MIDDLE_CLICK))
 		ShiftMiddleClickOn(A)
 		return
 	if(LAZYACCESS(modifiers, SHIFT_CLICK) && LAZYACCESS(modifiers, CTRL_CLICK))
 		CtrlShiftClickOn(A)
 		return
-	if(modifiers["middle"])
+	if(LAZYACCESS(modifiers, MIDDLE_CLICK))
 		MiddleClickOn(A)
 		return
 	if(LAZYACCESS(modifiers, SHIFT_CLICK))
diff --git a/code/_onclick/overmind.dm b/code/_onclick/overmind.dm
index 363a2fde47..d5f5028283 100644
--- a/code/_onclick/overmind.dm
+++ b/code/_onclick/overmind.dm
@@ -3,7 +3,7 @@
 
 /mob/camera/blob/ClickOn(var/atom/A, var/params) //Expand blob
 	var/list/modifiers = params2list(params)
-	if(modifiers["middle"])
+	if(LAZYACCESS(modifiers, MIDDLE_CLICK))
 		MiddleClickOn(A)
 		return
 	if(LAZYACCESS(modifiers, SHIFT_CLICK))
diff --git a/code/_rendering/clickcatcher/clickcatcher.dm b/code/_rendering/clickcatcher/clickcatcher.dm
index 524f753e98..907dfcb3c5 100644
--- a/code/_rendering/clickcatcher/clickcatcher.dm
+++ b/code/_rendering/clickcatcher/clickcatcher.dm
@@ -35,7 +35,7 @@
 
 /atom/movable/screen/click_catcher/Click(location, control, params)
 	var/list/modifiers = params2list(params)
-	if(modifiers["middle"] && iscarbon(usr))
+	if(LAZYACCESS(modifiers, MIDDLE_CLICK) && iscarbon(usr))
 		var/mob/living/carbon/C = usr
 		C.swap_hand()
 	else
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index 9912bce66e..bc588c5daa 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -101,7 +101,7 @@
 	user.face_atom(A)
 
 	var/list/modifiers = params2list(params)
-	if(LAZYACCESS(modifiers, ALT_CLICK) || LAZYACCESS(modifiers, SHIFT_CLICK) || LAZYACCESS(modifiers, CTRL_CLICK) || modifiers["middle"])
+	if(LAZYACCESS(modifiers, ALT_CLICK) || LAZYACCESS(modifiers, SHIFT_CLICK) || LAZYACCESS(modifiers, CTRL_CLICK) || LAZYACCESS(modifiers, MIDDLE_CLICK))
 		return
 
 	user.tackling = TRUE
diff --git a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
index 0babe82f6b..1616971277 100644
--- a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
+++ b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
@@ -113,7 +113,7 @@
 	if(LAZYACCESS(modifiers, ALT_CLICK) && istype(A, /turf/closed/wall/clockwork))
 		superheat_wall(A)
 		return
-	if(modifiers["middle"] || LAZYACCESS(modifiers, CTRL_CLICK))
+	if(LAZYACCESS(modifiers, MIDDLE_CLICK) || LAZYACCESS(modifiers, CTRL_CLICK))
 		INVOKE_ASYNC(src, .proc/issue_command, A)
 		return
 	if(GLOB.ark_of_the_clockwork_justiciar == A)