diff --git a/Makefile b/Makefile
index dbda9104a..478fbeed7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,12 @@ FORK_CHOICE_DIR = ./fork_choice
 # To check generator matching:
 #$(info $$GENERATOR_TARGETS is [${GENERATOR_TARGETS}])
 
+MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/*/*.md) \
+                 $(wildcard $(SPEC_DIR)/*/*/*.md) \
+                 $(wildcard $(SPEC_DIR)/_features/*/*.md) \
+                 $(wildcard $(SPEC_DIR)/_features/*/*/*.md) \
+                 $(wildcard $(SSZ_DIR)/*.md)
+
 ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb electra whisk eip6800 eip7732
 # The parameters for commands. Use `foreach` to avoid listing specs again.
 COVERAGE_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), --cov=eth2spec.$S.$(TEST_PRESET_TYPE))
@@ -135,26 +141,15 @@ endif
 open_cov:
 	((open "$(COV_INDEX_FILE)" || xdg-open "$(COV_INDEX_FILE)") &> /dev/null) &
 
-# When using .ONESHELL, bail on errors.
-.SHELLFLAGS = -e
-
-# This contains all markdown files that should have table of contents.
-MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/*/*.md) \
-                 $(wildcard $(SPEC_DIR)/*/*/*.md) \
-                 $(wildcard $(SPEC_DIR)/_features/*/*.md) \
-                 $(wildcard $(SPEC_DIR)/_features/*/*/*.md) \
-                 $(wildcard $(SSZ_DIR)/*.md)
-
 # Check all files and error if any ToC were modified.
 check_toc: $(MARKDOWN_FILES:=.toc)
 	@[ "$$(find . -name '*.md.tmp' -print -quit)" ] && exit 1 || exit 0
 
 # Generate ToC sections & save copy of original if modified.
-.ONESHELL:
 %.toc:
-	@cp $* $*.tmp
-	@doctoc $* > /dev/null
-	@if diff -q $* $*.tmp > /dev/null; then \
+	@cp $* $*.tmp; \
+	doctoc $* > /dev/null; \
+	if diff -q $* $*.tmp > /dev/null; then \
 		echo "Good $*"; \
 		rm $*.tmp; \
 	else \