diff --git a/examples/Makefile b/examples/Makefile
index 7e579d1e5..bd136827b 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -2,7 +2,7 @@ MPL=../build/bin/mpl
 FLAGS=-default-type int64 -default-type word64
 DBG_FLAGS=-debug true -debug-runtime true -keep g
 TRACE_FLAGS=-trace true -trace-runtime true
-DETECT_FLAGS=-detect-entanglement true
+NODETECT_FLAGS=-detect-entanglement false
 
 PROGRAMS= \
 	fib \
@@ -21,14 +21,14 @@ PROGRAMS= \
 
 TRACE_PROGRAMS := $(addsuffix .trace,$(PROGRAMS))
 DBG_PROGRAMS := $(addsuffix .dbg,$(PROGRAMS))
-DETECT_PROGRAMS := $(addsuffix .detect,$(PROGRAMS))
+NODETECT_PROGRAMS := $(addsuffix .nodetect,$(PROGRAMS))
 SYSMPL_PROGRAMS := $(addsuffix .sysmpl,$(PROGRAMS))
 
 all: $(PROGRAMS)
 
 all-dbg: $(DBG_PROGRAMS)
 
-all-detect: $(DETECT_PROGRAMS)
+all-nodetect: $(DETECT_PROGRAMS)
 
 all-sysmpl: $(SYSMPL_PROGRAMS)
 
@@ -47,10 +47,10 @@ $(TRACE_PROGRAMS): %.trace: phony
 	$(MPL) $(FLAGS) $(TRACE_FLAGS) -output bin/$*.trace src/$*/sources.mlb
 	@echo "successfully built bin/$*.trace"
 
-$(DETECT_PROGRAMS): %.detect: phony
+$(NODETECT_PROGRAMS): %.nodetect: phony
 	@mkdir -p bin
-	$(MPL) $(FLAGS) $(DETECT_FLAGS) -output bin/$*.detect src/$*/sources.mlb
-	@echo "successfully built bin/$*.detect"
+	$(MPL) $(FLAGS) $(NODETECT_FLAGS) -output bin/$*.nodetect src/$*/sources.mlb
+	@echo "successfully built bin/$*.nodetect"
 
 $(SYSMPL_PROGRAMS): %.sysmpl: phony
 	@mkdir -p bin
diff --git a/mlton/control/control-flags.sml b/mlton/control/control-flags.sml
index 91b06ae01..a401d44bf 100644
--- a/mlton/control/control-flags.sml
+++ b/mlton/control/control-flags.sml
@@ -296,12 +296,12 @@ val defaultWord = control {name = "defaultWord",
 
 val detectEntanglement =
   control {name = "detect-entanglement",
-           default = false,
+           default = true,
            toString = Bool.toString}
 
 val detectEntanglementRuntime =
   control {name = "detect-entanglement-runtime",
-           default = false,
+           default = true,
            toString = Bool.toString}
 
 val diagPasses =