diff --git a/library/Mmakefile b/library/Mmakefile
index da2e88861..17afc3044 100644
--- a/library/Mmakefile
+++ b/library/Mmakefile
@@ -80,9 +80,8 @@ endif
 # maintain the expected output of the debugging test cases in debugging grades.
 #
 # Always generate dependencies for use by `mmc --make'.
-MCFLAGS += --strict-sequential --trace minimum $(ALL_GRADEFLAGS) \
-		--generate-mmc-deps $(INTERMODULE_OPTS) \
-		$(ENABLE_TERM_OPTS) $(CHECK_TERM_OPTS)
+MCFLAGS += --strict-sequential --trace minimum --generate-mmc-deps \
+		$(INTERMODULE_OPTS) $(ENABLE_TERM_OPTS) $(CHECK_TERM_OPTS)
 
 # The IL and Java implementations of the standard library are not yet complete,
 # so we need to pass `--allow-stubs' to get them to compile.
diff --git a/scripts/Mmake.rules b/scripts/Mmake.rules
index 3fc1a1917..00a0ca73d 100644
--- a/scripts/Mmake.rules
+++ b/scripts/Mmake.rules
@@ -136,13 +136,13 @@ endif	# MMAKE_USE_MMC_MAKE == no
 ifeq ($(MMAKE_USE_MMC_MAKE), no)
 
 $(date0s_subdir)%.date0 : %.m
-	$(MCPI) $(ALL_MCPIFLAGS) $(*F)
+	$(MCPI) $(ALL_GRADEFLAGS) $(ALL_MCPIFLAGS) $(*F)
 
 $(dates_subdir)%.date : %.m
-	$(MCI) $(ALL_MCIFLAGS) $(*F)
+	$(MCI) $(ALL_GRADEFLAGS) $(ALL_MCIFLAGS) $(*F)
 
 $(date3s_subdir)%.date3 : %.m
-	$(MCSI) $(ALL_MCSIFLAGS) $(*F)
+	$(MCSI) $(ALL_GRADEFLAGS) $(ALL_MCSIFLAGS) $(*F)
 
 $(optdates_subdir)%.optdate : %.m
 	$(MCOI) $(ALL_GRADEFLAGS) $(ALL_MCOIFLAGS) $(*F)