diff --git a/Makefile.am b/Makefile.am
index b7027d0..c18aa8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -204,7 +204,7 @@ gnulib-local/libgnulib.la:
 $(srcdir)/jitter/jitter-fast-branch-machine-generated.h: scripts/generate-fast-branches.in.m4sh
 	$(MAKE) scripts/generate-fast-branches \
 	  && (echo "Generating fast-branch header: this might take a while."; \
-              ./scripts/generate-fast-branches \
+	      ./scripts/generate-fast-branches \
 	      > $(srcdir)/jitter/jitter-fast-branch-machine-generated.h)
 
 BUILT_SOURCES += \
@@ -413,11 +413,11 @@ $(srcdir)/jitterc/jitterc-scanner.c: jitterc/jitterc.l
 	  "$(srcdir)/jitterc/jitterc.l" && \
 	  echo '#include <config.h> /* Non-flex-generated line */' \
 	  | cat - "$@"_tmp > "$@" && \
-          rm "$@"_tmp
+	  rm "$@"_tmp
 $(srcdir)/jitterc/jitterc-scanner.h: jitterc/jitterc-scanner.c
 	echo '#include <config.h> /* Non-flex-generated line */' \
 	  | cat - "$@"_tmp > "$@" && \
-          rm "$@"_tmp
+	  rm "$@"_tmp
 
 
 # jitter C-code-generator program.
@@ -482,9 +482,9 @@ if JITTER_HAVE_AUTOM4TE
 # First part: generic suffix rule.
 .in.m4sh.in:
 	$(AUTOM4TE) \
-          --language=M4sh --prepend-include="$(top_srcdir)/m4-utility" \
-          --output="$@" "$^" \
-          && "$(top_srcdir)/amend-autom4te-output" "$@"
+	  --language=M4sh --prepend-include="$(top_srcdir)/m4-utility" \
+	  --output="$@" "$^" \
+	  && "$(top_srcdir)/amend-autom4te-output" "$@"
 # Second part: explicit dependencies.  At least the body can be factored thanks
 # to the suffix rule.
 bin/jitter-config.in: $(top_srcdir)/m4-utility/jitter-script.m4sh
@@ -1076,13 +1076,13 @@ EXTRA_PROGRAMS += $(PROGRAMS_UNINSPIRED)
 # there is no dependency on bin/jitter$(EXEEXT) .
 $(srcdir)/example-vms/uninspired/uninspired-vm.h: example-vms/uninspired/uninspired.jitter $(DEPENDENCIES_FOR_JITTER_GENERATED_FILES)
 	$(JITTER_EMULATOR) bin/jitter$(EXEEXT) \
-          "$(srcdir)/example-vms/uninspired/uninspired.jitter" \
-          --output "$(srcdir)/example-vms/uninspired/" \
-          --frontend \
-          --no-line \
-          --max-fast-register-no=$(UNINSPIRED_MAX_FAST_REGISTER_NO) \
-          --max-nonresidual-no=$(UNINSPIRED_MAX_NONRESIDUAL_NO) \
-          --template-directory="$(srcdir)/templates/"
+	  "$(srcdir)/example-vms/uninspired/uninspired.jitter" \
+	  --output "$(srcdir)/example-vms/uninspired/" \
+	  --frontend \
+	  --no-line \
+	  --max-fast-register-no=$(UNINSPIRED_MAX_FAST_REGISTER_NO) \
+	  --max-nonresidual-no=$(UNINSPIRED_MAX_NONRESIDUAL_NO) \
+	  --template-directory="$(srcdir)/templates/"
 $(srcdir)/example-vms/uninspired/uninspired-vm1.c: example-vms/uninspired/uninspired-vm.h
 $(srcdir)/example-vms/uninspired/uninspired-vm2.c: example-vms/uninspired/uninspired-vm.h
 $(srcdir)/example-vms/uninspired/uninspired-vm-main.c: example-vms/uninspired/uninspired-vm.h
@@ -1408,7 +1408,7 @@ $(srcdir)/example-vms/structured/structured-parser.c: example-vms/structured/str
 $(srcdir)/example-vms/structured/structured-parser.h: example-vms/structured/structured-parser.c
 $(srcdir)/example-vms/structured/structured-scanner.c: example-vms/structured/structured.l
 	$(LEX) --header-file="$(srcdir)/example-vms/structured/structured-scanner.h" -o"$@" \
-          "$(srcdir)/example-vms/structured/structured.l"
+	  "$(srcdir)/example-vms/structured/structured.l"
 $(srcdir)/example-vms/structured/structured-scanner.h: example-vms/structured/structured-scanner.c
 
 # Jitter-generated files for the structured-language VM, used for the structured
@@ -1421,13 +1421,13 @@ $(srcdir)/example-vms/structured/structured-scanner.h: example-vms/structured/st
 # there is no dependency on bin/jitter$(EXEEXT) .
 $(srcdir)/example-vms/structured/structuredvm-vm-main.c: example-vms/structured/structured.jitter $(DEPENDENCIES_FOR_JITTER_GENERATED_FILES)
 	$(JITTER_EMULATOR) bin/jitter$(EXEEXT) \
-          "$(srcdir)/example-vms/structured/structured.jitter" \
-          --output "$(srcdir)/example-vms/structured/" \
-          --frontend \
-          --no-line \
-          --max-fast-register-no=$(STRUCTUREDVM_MAX_FAST_REGISTER_NO) \
-          --max-nonresidual-no=$(STRUCTUREDVM_MAX_NONRESIDUAL_NO) \
-          --template-directory="$(srcdir)/templates/"
+	  "$(srcdir)/example-vms/structured/structured.jitter" \
+	  --output "$(srcdir)/example-vms/structured/" \
+	  --frontend \
+	  --no-line \
+	  --max-fast-register-no=$(STRUCTUREDVM_MAX_FAST_REGISTER_NO) \
+	  --max-nonresidual-no=$(STRUCTUREDVM_MAX_NONRESIDUAL_NO) \
+	  --template-directory="$(srcdir)/templates/"
 $(srcdir)/example-vms/structured/structuredvm-vm.h: example-vms/structured/structuredvm-vm-main.c
 $(srcdir)/example-vms/structured/structuredvm-vm1.c: example-vms/structured/structuredvm-vm-main.c
 $(srcdir)/example-vms/structured/structuredvm-vm2.c: example-vms/structured/structuredvm-vm-main.c
@@ -1463,8 +1463,8 @@ if JITTER_CAN_REBUILD_MAN_PAGES
   # See the comment about doc/jitter.1 and its conditional generation.
   $(srcdir)/example-vms/structured/doc/structured.1: bin/structured$(EXEEXT)
 	$(HELP2MAN_WITH_OPTIONS) --output="$@" \
-          --info-page='structured' \
-          "$(JITTER_EMULATOR) bin/structured$(EXEEXT)" || true
+	  --info-page='structured' \
+	  "$(JITTER_EMULATOR) bin/structured$(EXEEXT)" || true
 else # ! JITTER_CAN_REBUILD_MAN_PAGES
   $(srcdir)/example-vms/structured/doc/structured.1: doc/missing-man-page.1
 	cp "$(srcdir)/doc/missing-man-page.1" "$@" || true
@@ -1556,10 +1556,10 @@ example-vms/jitterlisp/jitterlisp-sexpression.c: $(GENERATED_C_FILES_FOR_JITTERL
 # the same command.
 $(srcdir)/example-vms/jitterlisp/jitterlispvm-vm.h: example-vms/jitterlisp/jitterlisp.jitter $(DEPENDENCIES_FOR_JITTER_GENERATED_FILES)
 	$(JITTER_EMULATOR) bin/jitter$(EXEEXT) \
-          "$(srcdir)/example-vms/jitterlisp/jitterlisp.jitter" \
-          --output "$(srcdir)/example-vms/jitterlisp/" \
-          --no-line \
-          --template-directory="$(srcdir)/templates/"
+	  "$(srcdir)/example-vms/jitterlisp/jitterlisp.jitter" \
+	  --output "$(srcdir)/example-vms/jitterlisp/" \
+	  --no-line \
+	  --template-directory="$(srcdir)/templates/"
 $(srcdir)/example-vms/jitterlisp/jitterlispvm-vm1.c: example-vms/jitterlisp/jitterlispvm-vm.h
 $(srcdir)/example-vms/jitterlisp/jitterlispvm-vm2.c: example-vms/jitterlisp/jitterlispvm-vm.h
 
@@ -1576,20 +1576,20 @@ JITTERLISP_SED_STRINGIFY = \
 
 $(srcdir)/example-vms/jitterlisp/jitterlisp-constant-strings.c: example-vms/jitterlisp/jitterlisp-library.lisp NO-WARRANTY COPYING
 	(echo "/* This C file is machine-generated, and is not the actual source. */"; \
-         echo; \
-         echo "const char *jitterlisp_library_string ="; \
-         cat "$(srcdir)/example-vms/jitterlisp/jitterlisp-library.lisp" \
-          | @SED@ $(JITTERLISP_SED_STRINGIFY); \
-         echo ";"; \
-         echo "const char *jitterlisp_no_warranty ="; \
-         cat "$(srcdir)/NO-WARRANTY" \
-          | @SED@ $(JITTERLISP_SED_STRINGIFY); \
-         echo ";"; \
-         echo "const char *jitterlisp_gpl ="; \
-         cat "$(srcdir)/COPYING" \
-          | @SED@ $(JITTERLISP_SED_STRINGIFY); \
-         echo ";") \
-          > "$@"
+	 echo; \
+	 echo "const char *jitterlisp_library_string ="; \
+	 cat "$(srcdir)/example-vms/jitterlisp/jitterlisp-library.lisp" \
+	  | @SED@ $(JITTERLISP_SED_STRINGIFY); \
+	 echo ";"; \
+	 echo "const char *jitterlisp_no_warranty ="; \
+	 cat "$(srcdir)/NO-WARRANTY" \
+	  | @SED@ $(JITTERLISP_SED_STRINGIFY); \
+	 echo ";"; \
+	 echo "const char *jitterlisp_gpl ="; \
+	 cat "$(srcdir)/COPYING" \
+	  | @SED@ $(JITTERLISP_SED_STRINGIFY); \
+	 echo ";") \
+	  > "$@"
 
 # The safe and unsafe JitterLisp programss, with the best dispatch...
 PROGRAMS_JITTERLISP += bin/jitterlisp
@@ -1640,7 +1640,7 @@ if JITTER_CAN_REBUILD_MAN_PAGES
   # See the comment about doc/jitter.1 and its conditional generation.
   $(srcdir)/example-vms/jitterlisp/doc/jitterlisp.1: bin/jitterlisp$(EXEEXT)
 	$(HELP2MAN_WITH_OPTIONS) --output="$@" \
-          --info-page='jitterlisp'\
+	  --info-page='jitterlisp'\
 	  "$(JITTER_EMULATOR) bin/jitterlisp$(EXEEXT)" || true
 else # ! JITTER_CAN_REBUILD_MAN_PAGES
   $(srcdir)/example-vms/jitterlisp/doc/jitterlisp.1: doc/missing-man-page.1
@@ -2051,13 +2051,13 @@ endif # ! JITTER_HAVE_TEXINFO
 # This is never built as a dependency.
 web-manuals:
 	(cd "$(abs_builddir)/doc" && \
-           mkdir -p web-manuals && \
+	   mkdir -p web-manuals && \
 	   cp "$(abs_srcdir)/build-aux/gendocs.sh" . && \
 	   cp "$(abs_srcdir)/gnulib-local-doc/gendocs_template" . && \
-           ./gendocs.sh --email "$(JITTER_PACKAGE_BUGREPORT)" \
-                        -s "$(abs_srcdir)/doc/jitter.texi" \
-                        -o "web-manuals" \
-                        jitter "The Jitter manual")
+	   ./gendocs.sh --email "$(JITTER_PACKAGE_BUGREPORT)" \
+	                -s "$(abs_srcdir)/doc/jitter.texi" \
+	                -o "web-manuals" \
+	                jitter "The Jitter manual")
 
 
 # Man pages
@@ -2165,8 +2165,8 @@ JITTER_GITLOG_TO_CHANGELOG_FLAGS = \
 if JITTER_BUILDING_FROM_GIT
   regenerate-changelog:
 	(cd "$(top_srcdir)" \
-          && (./build-aux/gitlog-to-changelog \
-                $(JITTER_GITLOG_TO_CHANGELOG_FLAGS) \
+	  && (./build-aux/gitlog-to-changelog \
+	        $(JITTER_GITLOG_TO_CHANGELOG_FLAGS) \
 	      && echo && echo && head -19 README) \
 	     > ChangeLog)
 else
@@ -2182,7 +2182,7 @@ changelog: regenerate-changelog
 # generated one.
 dist-hook-changelog: regenerate-changelog
 	chmod u+w "$(distdir)" "$(distdir)"/ChangeLog \
-          && cp "$(top_srcdir)/ChangeLog" "$(distdir)"
+	  && cp "$(top_srcdir)/ChangeLog" "$(distdir)"
 
 
 # Installation.
diff --git a/example-build-systems/structured-simple/Makefile.am b/example-build-systems/structured-simple/Makefile.am
index 5dc308c..386e3f8 100644
--- a/example-build-systems/structured-simple/Makefile.am
+++ b/example-build-systems/structured-simple/Makefile.am
@@ -192,10 +192,10 @@ EXTRA_DIST += \
 # standards recommend.
 maintainer-clean-aggressive:
 	for basename in $(BUILT_SOURCES) \
-                        configure Makefile.in \
-                        aclocal.m4 config.h.in \
-                        INSTALL build-aux; do \
-          rm -rf "$(srcdir)/$${basename}"; \
+	                configure Makefile.in \
+	                aclocal.m4 config.h.in \
+	                INSTALL build-aux; do \
+	  rm -rf "$(srcdir)/$${basename}"; \
 	done
 	rm -f "$(srcdir)/aclocal.m4" "$(srcdir)/config.h.in"
 
diff --git a/example-build-systems/structured-with-library/Makefile.am b/example-build-systems/structured-with-library/Makefile.am
index c42135f..11ab58b 100644
--- a/example-build-systems/structured-with-library/Makefile.am
+++ b/example-build-systems/structured-with-library/Makefile.am
@@ -139,7 +139,7 @@ $(srcdir)/structured-parser.c: structured.y
 $(srcdir)/structured-parser.h: structured-parser.c
 $(srcdir)/structured-scanner.c: structured.l
 	$(LEX) --header-file="$(srcdir)/structured-scanner.h" -o"$@" \
-          "$(srcdir)/structured.l"
+	  "$(srcdir)/structured.l"
 $(srcdir)/structured-scanner.h: structured-scanner.c
 
 
@@ -221,10 +221,10 @@ EXTRA_DIST += \
 # standards recommend.
 maintainer-clean-aggressive:
 	for basename in $(BUILT_SOURCES) \
-                        configure Makefile.in \
-                        aclocal.m4 config.h.in \
-                        INSTALL build-aux; do \
-          rm -rf "$(srcdir)/$${basename}"; \
+	                configure Makefile.in \
+	                aclocal.m4 config.h.in \
+	                INSTALL build-aux; do \
+	  rm -rf "$(srcdir)/$${basename}"; \
 	done
 	rm -f "$(srcdir)/aclocal.m4" "$(srcdir)/config.h.in"