diff --git a/code/__defines/math.dm b/code/__defines/math.dm
index 44730c9ce1..aaa1b41dc3 100644
--- a/code/__defines/math.dm
+++ b/code/__defines/math.dm
@@ -27,10 +27,9 @@
 
 #define SIGN(x) ( (x)!=0 ? (x) / abs(x) : 0 )
 
+#define ROUND_UP(x) ( -round(-(x)))
 #define CEILING(x, y) ( -round(-(x) / (y)) * (y) )
 
-#define ROUND_UP(x) ( -round(-(x))) // CHOMPEdit
-
 // round() acts like floor(x, 1) by default but can't handle other values
 #define FLOOR(x, y) ( round((x) / (y)) * (y) )
 
diff --git a/code/modules/ai/ai_holder.dm b/code/modules/ai/ai_holder.dm
index 6d429540be..acf5fe0dc3 100644
--- a/code/modules/ai/ai_holder.dm
+++ b/code/modules/ai/ai_holder.dm
@@ -65,7 +65,7 @@
 										// consider sleeping the AI instead.
 	var/process_flags = 0				// Where we're processing, see flag defines.
 	var/list/snapshot = null			// A list used in mass-editing of AI datums, holding a snapshot of the 'before' state
-	var/list/static/fastprocess_stances = list(
+	var/static/list/fastprocess_stances = list(
 		STANCE_ALERT,
 		STANCE_APPROACH,
 		STANCE_FIGHT,
@@ -76,7 +76,7 @@
 		STANCE_FLEE,
 		STANCE_DISABLED
 	)
-	var/list/static/noprocess_stances = list(
+	var/static/list/noprocess_stances = list(
 		STANCE_SLEEP
 	)
 
diff --git a/tools/ci/validate_files.sh b/tools/ci/validate_files.sh
index 453d5fec34..78a29bc5a5 100755
--- a/tools/ci/validate_files.sh
+++ b/tools/ci/validate_files.sh
@@ -80,6 +80,13 @@ echo -e "${RED}DISABLED"
 #   FAILED=1
 # fi
 
+part "improperly pathed static lists"
+if $grep -i 'var/list/static/.*' $code_files; then
+	echo
+	echo -e "${RED}ERROR: Found incorrect static list definition 'var/list/static/', it should be 'var/static/list/' instead.${NC}"
+	st=1
+fi;
+
 part "changelog"
 #Checking for a change to html/changelogs/example.yml
 md5sum -c - <<< "0c56937110d88f750a32d9075ddaab8b *html/changelogs_ch/example.yml" # CHOMPedit - Better changelogs