diff --git a/src/gui/favorite.js b/src/gui/favorite.js
index 1c6e89ba298f847c588b2113b43cb8f9854bc76c..8a0447090154abb12f96f1ae2810b1eca1864cb4 100644
--- a/src/gui/favorite.js
+++ b/src/gui/favorite.js
@@ -1,7 +1,6 @@
-
 /** Render a link that toggles the slave's favorite status
  * @param {App.Entity.SlaveState} slave
- * @returns {HTMLSpanElement}
+ * @returns {HTMLAnchorElement}
  */
 App.UI.favoriteToggle = function(slave) {
 	function favLink() {
diff --git a/src/js/consistencyCheck.js b/src/js/consistencyCheck.js
index bdb26b021b694b3cf996538e9e715f56cc137fcd..d15dd310ff36eb5156d2c6ffecb6a0e1f94a28ce 100644
--- a/src/js/consistencyCheck.js
+++ b/src/js/consistencyCheck.js
@@ -1,7 +1,11 @@
-/* checks V.slaves for consistency */
-$(document).on(":passagestart", event => {
+/**
+ * checks V.slaves for consistency
+ * @param {PassageRenderingEvent} event
+ */
+App.Debug.slavesConsistency = function(event) {
 	if (event.passage.title !== "AS Dump" // Don't put in the work on passages we leave immediately anyway.
 		&& V.slaves !== undefined) { // no V.slaves at game start
+
 		if (V.slaves.includes(null)) {
 			const p = document.createElement("p");
 			p.append(App.UI.DOM.makeElement("span", "ERROR: Main slaves array contains a null entry! Please report this. ", "error"),
@@ -23,9 +27,9 @@ $(document).on(":passagestart", event => {
 							}))
 							.filter(s => s.ID === id)
 							.map(s => `${s.idx}: ${s.name} (${s.assignment})`)
-							.join(', ')
+							.join(", ")
 					}`, "error"));
 				});
 		}
 	}
-});
+};
diff --git a/src/zz1-last/setupEventHandlers.js b/src/zz1-last/setupEventHandlers.js
index 50c38e6745700721c3e994f1347766c92f237907..bbe69053495bd2b344be8b4e7d5aae5a2de385a0 100644
--- a/src/zz1-last/setupEventHandlers.js
+++ b/src/zz1-last/setupEventHandlers.js
@@ -2,15 +2,14 @@
 Config.saves.onLoad = App.EventHandlers.onLoad;
 Config.saves.onSave = App.EventHandlers.onSave;
 
-$(document).on(':storyready', function() {
-	App.EventHandlers.storyReady();
-});
+/* ### Every-time listeners #### */
 
-$(document).one(':passagestart', function() {
-	App.EventHandlers.optionsChanged();
+$(document).on(":storyready", () => {
+	App.EventHandlers.storyReady();
 });
 
-$(document).on(':passagestart', function() {
+$(document).on(":passagestart", event => {
+	App.Debug.slavesConsistency(event);
 	Object.defineProperty(State.temporary, "S", {
 		get: () => S,
 		enumerable: true
@@ -23,3 +22,9 @@ $(document).on(":passageinit", () => {
 		delete V.passageSwitchHandler;
 	}
 });
+
+/* ### One-time listeners ### */
+
+$(document).one(":passagestart", () => {
+	App.EventHandlers.optionsChanged();
+});