diff --git a/inform6/inform6.mk b/inform6/inform6.mk
index 8b9694a90..7f29e4fca 100644
--- a/inform6/inform6.mk
+++ b/inform6/inform6.mk
@@ -9,16 +9,18 @@ INDULGENTCC = clang -std=c99 -c $(FEWERWARNINGS) $(CCOPTS) -g
 
 CCOPTS = -DPLATFORM_MACOS=1 -mmacosx-version-min=10.6 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
 
-MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -ferror-limit=1000
+MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return -ferror-limit=1000
 
-FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt
+FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return
 
 LINK = clang $(CCOPTS) -g
 LINKEROPTS = 
 
+EXEEXTENSION = 
+
 ARTOOL = libtool -o
 
-INFORM6OS = OSX
+INFORM6OS = MACOS
 
 GLULXEOS = OS_UNIX
 
diff --git a/inter/building-module/Chapter 1/Packaging.w b/inter/building-module/Chapter 1/Packaging.w
index 0672146d0..526344ea3 100644
--- a/inter/building-module/Chapter 1/Packaging.w	
+++ b/inter/building-module/Chapter 1/Packaging.w	
@@ -216,6 +216,7 @@ packaging_state Packaging::enter_home_of(inter_name *N) {
 }
 
 packaging_state Packaging::enter(package_request *R) {
+	if (R == NULL) internal_error("no such package request");
 	LOGIF(PACKAGING, "Entering $X\n", R);
 	packaging_state save = R->tree->site.spdata.current_state;
 	Packaging::incarnate(R);
diff --git a/inter/building-test/building-test.mk b/inter/building-test/building-test.mk
index 3649f1032..e9fc1c019 100644
--- a/inter/building-test/building-test.mk
+++ b/inter/building-test/building-test.mk
@@ -9,16 +9,18 @@ INDULGENTCC = clang -std=c99 -c $(FEWERWARNINGS) $(CCOPTS) -g
 
 CCOPTS = -DPLATFORM_MACOS=1 -mmacosx-version-min=10.6 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
 
-MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -ferror-limit=1000
+MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return -ferror-limit=1000
 
-FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt
+FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return
 
 LINK = clang $(CCOPTS) -g
 LINKEROPTS = 
 
+EXEEXTENSION = 
+
 ARTOOL = libtool -o
 
-INFORM6OS = OSX
+INFORM6OS = MACOS
 
 GLULXEOS = OS_UNIX
 
@@ -27,7 +29,7 @@ INTEST = /Users/gnelson/Natural\ Inform/intest/Tangled/intest
 MYNAME = building-test
 ME = inter/building-test
 
-$(ME)/Tangled/$(MYNAME): inter/building-test/*.w /Users/gnelson/Natural\ Inform/inweb/foundation-module/Preliminaries/*.w /Users/gnelson/Natural\ Inform/inweb/foundation-module/Chapter*/*.w inter/building-test/../building-module/Chapter*/*.w inter/building-test/../bytecode-module/Preliminaries/*.w inter/building-test/../bytecode-module/Chapter*/*.w inter/building-test/../../services/words-module/Preliminaries/*.w inter/building-test/../../services/words-module/Chapter*/*.w inter/building-test/Chapter*/*.w
+$(ME)/Tangled/$(MYNAME): inter/building-test/*.w /Users/gnelson/Natural\ Inform/inweb/foundation-module/Preliminaries/*.w /Users/gnelson/Natural\ Inform/inweb/foundation-module/Chapter*/*.w inter/building-test/../bytecode-module/Preliminaries/*.w inter/building-test/../bytecode-module/Chapter*/*.w inter/building-test/../building-module/Preliminaries/*.w inter/building-test/../building-module/Chapter*/*.w inter/building-test/../../services/arch-module/Preliminaries/*.w inter/building-test/../../services/arch-module/Chapter*/*.w inter/building-test/../../services/words-module/Preliminaries/*.w inter/building-test/../../services/words-module/Chapter*/*.w inter/building-test/Chapter*/*.w
 	$(call make-me)
 
 .PHONY: force
diff --git a/inter/index-module/Chapter 4/Map Configuration.w b/inter/index-module/Chapter 4/Map Configuration.w
index 6f291d2b0..10ea0dfb0 100644
--- a/inter/index-module/Chapter 4/Map Configuration.w	
+++ b/inter/index-module/Chapter 4/Map Configuration.w	
@@ -126,7 +126,6 @@ int ConfigureIndexMap::get_map_variable_index(text_stream *name, index_session *
 	if (s < 0) {
 		LOG("Tried to look up <%S>\n", name);
 		internal_error("looked up non-existent map variable");
-		s = 0;
 	}
 	return s;
 }
diff --git a/retrospective/makefile b/retrospective/makefile
index acb427a28..f9fd399df 100644
--- a/retrospective/makefile
+++ b/retrospective/makefile
@@ -9,16 +9,18 @@ INDULGENTCC = clang -std=c99 -c $(FEWERWARNINGS) $(CCOPTS) -g
 
 CCOPTS = -DPLATFORM_MACOS=1 -mmacosx-version-min=10.6 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
 
-MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -ferror-limit=1000
+MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return -ferror-limit=1000
 
-FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt
+FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return
 
 LINK = clang $(CCOPTS) -g
 LINKEROPTS = 
 
+EXEEXTENSION = 
+
 ARTOOL = libtool -o
 
-INFORM6OS = OSX
+INFORM6OS = MACOS
 
 GLULXEOS = OS_UNIX