diff --git a/src/cfs/cload.2 b/src/cfs/cload.2
index 4d830d1b..c4b6f3da 100644
--- a/src/cfs/cload.2
+++ b/src/cfs/cload.2
@@ -32,16 +32,51 @@
 <VFLOAD "ctell">
 <VFLOAD "parser">
 <VFLOAD "melee">
+
+; "Game data"
 <VFLOAD "act1">
 <VFLOAD "act2">
 <VFLOAD "act3">
-<VFLOAD "act4">
+; <VFLOAD "act4">
+<SETG END-GAME-EXISTS? <>>
 <VFLOAD "rooms">
 <VFLOAD "dung">
+
+; "Undefine stuff we don't need from MAKSTR"
+<GUNASSIGN MPOBLIST>
+<GUNASSIGN PINSERT>
+<GUNASSIGN CEVENT>
+<GUNASSIGN CEXIT>
+<GUNASSIGN DOOR>
+<GUNASSIGN EXIT>
+<GUNASSIGN ROOM>
+<GUNASSIGN FIND-PREP>
+<GUNASSIGN ADD-ACTION>
+<GUNASSIGN ADD-DIRECTIONS>
+<GUNASSIGN DSYNONYM>
+<GUNASSIGN VSYNONYM>
+<GUNASSIGN ADD-BUZZ>
+<GUNASSIGN ADD-ZORK>
+<GUNASSIGN SYNONYM>
+<GUNASSIGN ADD-DEMON>
+<GUNASSIGN ADD-ACTOR>
+<GUNASSIGN SADD-ACTION>
+<GUNASSIGN 1ADD-ACTION>
+<GUNASSIGN 1NRADD-ACTION>
+<GUNASSIGN MAKE-ACTION>
+<GUNASSIGN ADD-BUNCHER>
+<GUNASSIGN ADD-QUESTION>
+<GUNASSIGN ADD-INQOBJ>
+<GUNASSIGN GOBJECT>
+<GUNASSIGN OBJECT>
+<GUNASSIGN GET-OBJ>
+<GUNASSIGN GET-ROOM>
+
 ;<VFLOAD "b">
-<VFLOAD "disp1">
+;<VFLOAD "disp1">
+
 <VFLOAD "impl">
 <VFLOAD "sr">
 <VFLOAD "syntax">
-<VFLOAD "typhak">
+;<VFLOAD "typhak">
 <VFLOAD "util">
diff --git a/src/cfs/dung.356 b/src/cfs/dung.356
index e46d7007..c1e09966 100644
--- a/src/cfs/dung.356
+++ b/src/cfs/dung.356
@@ -6536,6 +6536,8 @@ be quite impossible for you to exit.
 
 ; "SUBTITLE END GAME QUESTIONS"
 
+<COND (,END-GAME-EXISTS?
+
 <ADD-QUESTION 
 "From which room can one enter the robber's hideaway without passing
 through the cyclops room?" ["TEMPL"]>
@@ -6564,3 +6566,5 @@ in Zorkmids?" ["30003"]>
 
 <ADD-QUESTION "In which room is 'Hello, Sailor!' useful?" ["NONE" "NOWHE"]>
 
+)>
+