diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index b52c7591a..b33de4ac9 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -193,7 +193,8 @@ This function is called by `org-babel-execute-src-block'."
     (org-babel-comint-in-buffer session
       (mapc (lambda (var)
               (end-of-line 1) (insert var) (comint-send-input nil t)
-              (org-babel-comint-wait-for-output session)) var-lines))
+              (org-babel-comint-wait-for-output session))
+	    var-lines))
     session))
 
 (defun org-babel-load-session:R (session body params)
@@ -464,6 +465,4 @@ Insert hline if column names in output have been requested."
 
 (provide 'ob-R)
 
-
-
 ;;; ob-R.el ends here
diff --git a/lisp/ob-abc.el b/lisp/ob-abc.el
index 2991f604d..d9fef6ac2 100644
--- a/lisp/ob-abc.el
+++ b/lisp/ob-abc.el
@@ -86,4 +86,5 @@
   (error "ABC does not support sessions"))
 
 (provide 'ob-abc)
+
 ;;; ob-abc.el ends here
diff --git a/lisp/ob-asymptote.el b/lisp/ob-asymptote.el
index bdc74b849..da7f870d4 100644
--- a/lisp/ob-asymptote.el
+++ b/lisp/ob-asymptote.el
@@ -134,6 +134,4 @@ Otherwise, it is either `real', if some elements are floats, or
 
 (provide 'ob-asymptote)
 
-
-
 ;;; ob-asymptote.el ends here
diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el
index 74bbc4c2b..577878349 100644
--- a/lisp/ob-awk.el
+++ b/lisp/ob-awk.el
@@ -106,6 +106,4 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-awk)
 
-
-
 ;;; ob-awk.el ends here
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index 85bcf1d41..c2937f695 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -105,6 +105,4 @@
 
 (provide 'ob-calc)
 
-
-
 ;;; ob-calc.el ends here
diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
index 552b7a037..d3484bb7c 100644
--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@@ -151,6 +151,4 @@ FILE exists at end of evaluation."
 
 (provide 'ob-comint)
 
-
-
 ;;; ob-comint.el ends here
diff --git a/lisp/ob-coq.el b/lisp/ob-coq.el
index 56a57cdf6..ddba5503f 100644
--- a/lisp/ob-coq.el
+++ b/lisp/ob-coq.el
@@ -76,3 +76,5 @@ create one.  Return the initialized session."
   (get-buffer org-babel-coq-buffer))
 
 (provide 'ob-coq)
+
+;;; ob-coq.el ends here
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index fcfc052d7..1bf59284e 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -1655,7 +1655,8 @@ Note: this function removes any hlines in TABLE."
       (mapcar (lambda (row)
                 (if (listp row)
                     (cons (or (pop rownames) "") row)
-                  row)) table)
+                  row))
+	      table)
     table))
 
 (defun org-babel-pick-name (names selector)
diff --git a/lisp/ob-css.el b/lisp/ob-css.el
index b03e8fac1..190f69cbf 100644
--- a/lisp/ob-css.el
+++ b/lisp/ob-css.el
@@ -43,6 +43,4 @@ CSS does not support sessions."
 
 (provide 'ob-css)
 
-
-
 ;;; ob-css.el ends here
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index 369a080b9..59129503e 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -119,6 +119,4 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-ditaa)
 
-
-
 ;;; ob-ditaa.el ends here
diff --git a/lisp/ob-dot.el b/lisp/ob-dot.el
index df83068b4..669d3cdbf 100644
--- a/lisp/ob-dot.el
+++ b/lisp/ob-dot.el
@@ -87,6 +87,4 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-dot)
 
-
-
 ;;; ob-dot.el ends here
diff --git a/lisp/ob-ebnf.el b/lisp/ob-ebnf.el
index 0bb3537b4..773edded4 100644
--- a/lisp/ob-ebnf.el
+++ b/lisp/ob-ebnf.el
@@ -23,18 +23,18 @@
 
 ;;; Commentary:
 
-;;; Org-Babel support for using ebnf2ps to generate encapsulated postscript
-;;; railroad diagrams. It recognizes these arguments:
-;;;
-;;;     :file is required; it must include the extension '.eps.' All the rules
-;;;           in the block will be drawn in the same file. This is done by
-;;;           inserting a '[<file>' comment at the start of the block (see the
-;;;           documentation for ebnf-eps-buffer for more information).
-;;;
-;;;     :style specifies a value in ebnf-style-database. This provides the
-;;;            ability to customize the output. The style can also specify the
-;;;            grammar syntax (by setting ebnf-syntax); note that only ebnf,
-;;;            iso-ebnf, and yacc are supported by this file.
+;; Org-Babel support for using ebnf2ps to generate encapsulated postscript
+;; railroad diagrams. It recognizes these arguments:
+;;
+;;     :file is required; it must include the extension '.eps.' All the rules
+;;           in the block will be drawn in the same file. This is done by
+;;           inserting a '[<file>' comment at the start of the block (see the
+;;           documentation for ebnf-eps-buffer for more information).
+;;
+;;     :style specifies a value in ebnf-style-database. This provides the
+;;            ability to customize the output. The style can also specify the
+;;            grammar syntax (by setting ebnf-syntax); note that only ebnf,
+;;            iso-ebnf, and yacc are supported by this file.
 
 ;;; Requirements:
 
@@ -77,4 +77,5 @@ This function is called by `org-babel-execute-src-block'."
       result)))
 
 (provide 'ob-ebnf)
+
 ;;; ob-ebnf.el ends here
diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el
index 095fbdb4f..4150f1f35 100644
--- a/lisp/ob-emacs-lisp.el
+++ b/lisp/ob-emacs-lisp.el
@@ -108,6 +108,4 @@ corresponding :lexical source block argument."
 
 (provide 'ob-emacs-lisp)
 
-
-
 ;;; ob-emacs-lisp.el ends here
diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el
index a939d934d..c11ebf19e 100644
--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@@ -144,6 +144,4 @@ This buffer is named by `org-babel-error-buffer-name'."
 
 (provide 'ob-eval)
 
-
-
 ;;; ob-eval.el ends here
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index bbf9b55a3..34caf9546 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -406,7 +406,6 @@ inhibit insertion of results into the buffer."
 	     (let (org-confirm-babel-evaluate)
 	       (org-babel-execute-src-block nil info)))))))))
 
-
 (provide 'ob-exp)
 
 ;;; ob-exp.el ends here
diff --git a/lisp/ob-forth.el b/lisp/ob-forth.el
index aef6784ca..b6191c307 100644
--- a/lisp/ob-forth.el
+++ b/lisp/ob-forth.el
@@ -76,7 +76,8 @@ This function is called by `org-babel-execute-src-block'."
 		    ;; Report errors.
 		    (org-babel-eval-error-notify 1
 		     (buffer-substring
-		      (+ (match-beginning 0) 1) (point-max))) nil))))
+		      (+ (match-beginning 0) 1) (point-max)))
+		    nil))))
 	      (split-string (org-trim
 			     (org-babel-expand-body:generic body params))
 			    "\n"
diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el
index 154465f28..7e15022b3 100644
--- a/lisp/ob-fortran.el
+++ b/lisp/ob-fortran.el
@@ -101,7 +101,8 @@ its header arguments."
 		     (concat
 		      ;; variables
 		      (mapconcat 'org-babel-fortran-var-to-fortran vars "\n")
-		      body) params)
+		      body)
+		     params)
 		  body) "\n") "\n")))
 
 (defun org-babel-fortran-ensure-main-wrap (body params)
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index 99f3dab7f..62ab04d94 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -278,6 +278,4 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
 
 (provide 'ob-gnuplot)
 
-
-
 ;;; ob-gnuplot.el ends here
diff --git a/lisp/ob-groovy.el b/lisp/ob-groovy.el
index 38e2a169c..caf35350c 100644
--- a/lisp/ob-groovy.el
+++ b/lisp/ob-groovy.el
@@ -65,7 +65,6 @@ This function is called by `org-babel-execute-src-block'."
       (cdr (assq :rowname-names params)) (cdr (assq :rownames params))))))
 
 (defvar org-babel-groovy-wrapper-method
-
   "class Runner extends Script {
     def out = new PrintWriter(new ByteArrayOutputStream())
     def run() { %s }
@@ -74,7 +73,6 @@ This function is called by `org-babel-execute-src-block'."
 println(new Runner().run())
 ")
 
-
 (defun org-babel-groovy-evaluate
     (session body &optional result-type result-params)
   "Evaluate BODY in external Groovy process.
@@ -111,6 +109,4 @@ supported in Groovy."
 
 (provide 'ob-groovy)
 
-
-
 ;;; ob-groovy.el ends here
diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el
index e004a3405..280616940 100644
--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@@ -32,11 +32,9 @@
 
 ;;; Requirements:
 
-;; - haskell-mode :: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
-;;
-;; - inf-haskell :: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
-;;
-;; - (optionally) lhs2tex :: http://people.cs.uu.nl/andres/lhs2tex/
+;; - haskell-mode: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
+;; - inf-haskell: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
+;; - (optionally) lhs2tex: http://people.cs.uu.nl/andres/lhs2tex/
 
 ;;; Code:
 (require 'ob)
@@ -215,6 +213,4 @@ constructs (header arguments, no-web syntax etc...) are ignored."
 
 (provide 'ob-haskell)
 
-
-
 ;;; ob-haskell.el ends here
diff --git a/lisp/ob-hledger.el b/lisp/ob-hledger.el
index 06d03b675..ff451befa 100644
--- a/lisp/ob-hledger.el
+++ b/lisp/ob-hledger.el
@@ -30,6 +30,8 @@
 ;; probably ~/.hledger.journal (it may not notice your $LEDGER_FILE env var).
 ;; So make ~/.hledger.journal a symbolic link to the real file if necessary.
 
+;; TODO Unit tests are more than welcome, too.
+
 ;;; Code:
 (require 'ob)
 
@@ -64,7 +66,4 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-hledger)
 
-
-
 ;;; ob-hledger.el ends here
-;; TODO Unit tests are more than welcome, too.
diff --git a/lisp/ob-io.el b/lisp/ob-io.el
index 4d1f15429..46e721b7a 100644
--- a/lisp/ob-io.el
+++ b/lisp/ob-io.el
@@ -90,7 +90,6 @@ in BODY as elisp."
 		  raw
 		  (org-babel-script-escape raw)))))))
 
-
 (defun org-babel-prep-session:io (_session _params)
   "Prepare SESSION according to the header arguments specified in PARAMS."
   (error "Sessions are not (yet) supported for Io"))
@@ -103,6 +102,4 @@ supported in Io."
 
 (provide 'ob-io)
 
-
-
 ;;; ob-io.el ends here
diff --git a/lisp/ob-java.el b/lisp/ob-java.el
index f04aa4580..e8ac67cbd 100644
--- a/lisp/ob-java.el
+++ b/lisp/ob-java.el
@@ -81,6 +81,4 @@ parameters may be used, like javac -verbose"
 
 (provide 'ob-java)
 
-
-
 ;;; ob-java.el ends here
diff --git a/lisp/ob-js.el b/lisp/ob-js.el
index 8f66d1020..7592040ab 100644
--- a/lisp/ob-js.el
+++ b/lisp/ob-js.el
@@ -201,6 +201,4 @@ then create.  Return the initialized session."
 
 (provide 'ob-js)
 
-
-
 ;;; ob-js.el ends here
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index e0cc1033b..2376b987b 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -84,7 +84,8 @@
                  (regexp-quote (format "%S" (car pair)))
                  (if (stringp (cdr pair))
                      (cdr pair) (format "%S" (cdr pair)))
-                 body))) (org-babel--get-vars params))
+                 body)))
+	(org-babel--get-vars params))
   (org-trim body))
 
 (defun org-babel-execute:latex (body params)
@@ -221,6 +222,6 @@ This function is called by `org-babel-execute-src-block'."
   "Return an error because LaTeX doesn't support sessions."
   (error "LaTeX does not support sessions"))
 
-
 (provide 'ob-latex)
+
 ;;; ob-latex.el ends here
diff --git a/lisp/ob-ledger.el b/lisp/ob-ledger.el
index e63e10608..2be1a39ac 100644
--- a/lisp/ob-ledger.el
+++ b/lisp/ob-ledger.el
@@ -65,6 +65,4 @@ called by `org-babel-execute-src-block'."
 
 (provide 'ob-ledger)
 
-
-
 ;;; ob-ledger.el ends here
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index f0e1ff635..8b126b26f 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -122,6 +122,4 @@ a property list containing the parameters of the block."
 
 (provide 'ob-lisp)
 
-
-
 ;;; ob-lisp.el ends here
diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el
index b046b54b1..5e7b5145f 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -107,7 +107,8 @@ VARS contains resolved variable references."
     (org-babel-comint-in-buffer session
       (mapc (lambda (var)
               (end-of-line 1) (insert var) (comint-send-input)
-              (org-babel-comint-wait-for-output session)) var-lines))
+              (org-babel-comint-wait-for-output session))
+	    var-lines))
     session))
 
 (defun org-babel-load-session:lua (session body params)
@@ -397,6 +398,4 @@ fd:close()"
 
 (provide 'ob-lua)
 
-
-
 ;;; ob-lua.el ends here
diff --git a/lisp/ob-makefile.el b/lisp/ob-makefile.el
index 15bf6ee83..d1f2fba98 100644
--- a/lisp/ob-makefile.el
+++ b/lisp/ob-makefile.el
@@ -43,6 +43,4 @@ does not support sessions."
 
 (provide 'ob-makefile)
 
-
-
 ;;; ob-makefile.el ends here
diff --git a/lisp/ob-matlab.el b/lisp/ob-matlab.el
index 958357f32..0d238a44f 100644
--- a/lisp/ob-matlab.el
+++ b/lisp/ob-matlab.el
@@ -42,6 +42,4 @@
 
 (provide 'ob-matlab)
 
-
-
 ;;; ob-matlab.el ends here
diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el
index 5d38cc301..c30b702a1 100644
--- a/lisp/ob-maxima.el
+++ b/lisp/ob-maxima.el
@@ -27,9 +27,7 @@
 ;; Org-Babel support for evaluating maxima entries.
 ;;
 ;; This differs from most standard languages in that
-;;
 ;; 1) there is no such thing as a "session" in maxima
-;;
 ;; 2) we are adding the "cmdline" header argument
 
 ;;; Code:
@@ -125,9 +123,6 @@ of the same value."
       (concat "[" (mapconcat #'org-babel-maxima-elisp-to-maxima val ", ") "]")
     (format "%s" val)))
 
-
 (provide 'ob-maxima)
 
-
-
 ;;; ob-maxima.el ends here
diff --git a/lisp/ob-mscgen.el b/lisp/ob-mscgen.el
index fa4d3e3ac..2bd9144f4 100644
--- a/lisp/ob-mscgen.el
+++ b/lisp/ob-mscgen.el
@@ -68,8 +68,7 @@ mscgen supported formats."
   (let* ((out-file (or (cdr (assq :file params)) "output.png" ))
          (filetype (or (cdr (assq :filetype params)) "png" )))
     (unless (cdr (assq :file params))
-      (error "
-ERROR: no output file specified.  Add \":file name.png\" to the src header"))
+      (error "ERROR: no output file specified.  Add \":file name.png\" to the src header"))
     (org-babel-eval (concat "mscgen -T " filetype " -o " out-file) body)
     nil)) ;; signal that output has already been written to file
 
@@ -79,6 +78,4 @@ ERROR: no output file specified.  Add \":file name.png\" to the src header"))
 
 (provide 'ob-mscgen)
 
-
-
 ;;; ob-msc.el ends here
diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el
index 6972dae21..2389f192c 100644
--- a/lisp/ob-ocaml.el
+++ b/lisp/ob-ocaml.el
@@ -166,6 +166,4 @@ Emacs-lisp table, otherwise return the results as a string."
 
 (provide 'ob-ocaml)
 
-
-
 ;;; ob-ocaml.el ends here
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index fbfc9b973..5cb47e956 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -136,7 +136,8 @@ specifying a variable of the same value."
     (org-babel-comint-in-buffer session
       (mapc (lambda (var)
               (end-of-line 1) (insert var) (comint-send-input nil t)
-              (org-babel-comint-wait-for-output session)) var-lines))
+              (org-babel-comint-wait-for-output session))
+	    var-lines))
     session))
 
 (defun org-babel-matlab-initiate-session (&optional session params)
@@ -230,7 +231,8 @@ value of the last statement in BODY, as elisp."
 			 org-babel-octave-eoe-indicator
 		       org-babel-octave-eoe-output)
 		     t full-body)
-		  (insert full-body) (comint-send-input nil t)))) results)
+		  (insert full-body) (comint-send-input nil t))))
+	 results)
     (pcase result-type
       (`value
        (org-babel-octave-import-elisp-from-file tmp-file))
@@ -259,6 +261,4 @@ This removes initial blank and comment lines and then calls
 
 (provide 'ob-octave)
 
-
-
 ;;; ob-octave.el ends here
diff --git a/lisp/ob-org.el b/lisp/ob-org.el
index 63165019a..858c78346 100644
--- a/lisp/ob-org.el
+++ b/lisp/ob-org.el
@@ -67,6 +67,4 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-org)
 
-
-
 ;;; ob-org.el ends here
diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el
index 2daf57741..3e784e2a0 100644
--- a/lisp/ob-perl.el
+++ b/lisp/ob-perl.el
@@ -152,6 +152,4 @@ return the value of the last statement in BODY, as elisp."
 
 (provide 'ob-perl)
 
-
-
 ;;; ob-perl.el ends here
diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el
index ec2a22845..1b09f370f 100644
--- a/lisp/ob-picolisp.el
+++ b/lisp/ob-picolisp.el
@@ -182,6 +182,4 @@ then create.  Return the initialized session."
 
 (provide 'ob-picolisp)
 
-
-
 ;;; ob-picolisp.el ends here
diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el
index 14fc43619..0e1d4eda2 100644
--- a/lisp/ob-plantuml.el
+++ b/lisp/ob-plantuml.el
@@ -127,6 +127,4 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-plantuml)
 
-
-
 ;;; ob-plantuml.el ends here
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index de718b04b..11c8fc575 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -104,7 +104,8 @@ VARS contains resolved variable references."
     (org-babel-comint-in-buffer session
       (mapc (lambda (var)
               (end-of-line 1) (insert var) (comint-send-input)
-              (org-babel-comint-wait-for-output session)) var-lines))
+              (org-babel-comint-wait-for-output session))
+	    var-lines))
     session))
 
 (defun org-babel-load-session:python (session body params)
@@ -382,6 +383,4 @@ __org_babel_python_final))"
 
 (provide 'ob-python)
 
-
-
 ;;; ob-python.el ends here
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index 19905bf6b..394c4ffb5 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -143,7 +143,8 @@ Emacs Lisp representation of the value of the variable."
 				   (org-babel-ref-split-args new-referent))))
 	      (when (> (length new-header-args) 0)
 		(setq args (append (org-babel-parse-header-arguments
-				    new-header-args) args)))
+				    new-header-args)
+				   args)))
 	      (setq ref new-refere)))
 	  (when (string-match "^\\(.+\\):\\(.+\\)$" ref)
 	    (setq split-file (match-string 1 ref))
@@ -240,7 +241,6 @@ to \"0:-1\"."
   "Split ARG-STRING into top-level arguments of balanced parenthesis."
   (mapcar #'org-trim (org-babel-balanced-split arg-string 44)))
 
-
 (provide 'ob-ref)
 
 ;;; ob-ref.el ends here
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index 90956271c..44017dcf7 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -103,7 +103,8 @@ This function is called by `org-babel-execute-src-block'."
       (mapc (lambda (var)
               (insert var) (comint-send-input nil t)
               (org-babel-comint-wait-for-output session)
-              (sit-for .1) (goto-char (point-max))) var-lines))
+              (sit-for .1) (goto-char (point-max)))
+	    var-lines))
     session))
 
 (defun org-babel-load-session:ruby (session body params)
@@ -263,6 +264,4 @@ return the value of the last statement in BODY, as elisp."
 
 (provide 'ob-ruby)
 
-
-
 ;;; ob-ruby.el ends here
diff --git a/lisp/ob-sass.el b/lisp/ob-sass.el
index 60c081dcb..706005d5b 100644
--- a/lisp/ob-sass.el
+++ b/lisp/ob-sass.el
@@ -65,6 +65,4 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-sass)
 
-
-
 ;;; ob-sass.el ends here
diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el
index bba7b790b..75a2dc691 100644
--- a/lisp/ob-screen.el
+++ b/lisp/ob-screen.el
@@ -138,6 +138,4 @@ The terminal should shortly flicker."
 
 (provide 'ob-screen)
 
-
-
 ;;; ob-screen.el ends here
diff --git a/lisp/ob-sed.el b/lisp/ob-sed.el
index 8787cbc58..6914cd3bf 100644
--- a/lisp/ob-sed.el
+++ b/lisp/ob-sed.el
@@ -67,7 +67,8 @@ function is called by `org-babel-execute-src-block'."
          (in-file (cdr (assq :in-file params)))
 	 (code-file (let ((file (org-babel-temp-file "sed-")))
                       (with-temp-file file
-			(insert body)) file))
+			(insert body))
+		      file))
 	 (stdin (let ((stdin (cdr (assq :stdin params))))
 		   (when stdin
 		     (let ((tmp (org-babel-temp-file "sed-stdin-"))
@@ -101,4 +102,5 @@ function is called by `org-babel-execute-src-block'."
       (cdr (assq :rowname-names params)) (cdr (assq :rownames params))))))
 
 (provide 'ob-sed)
+
 ;;; ob-sed.el ends here
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index 1383f42f2..37774216e 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -96,7 +96,8 @@ This function is called by `org-babel-execute-src-block'."
     (org-babel-comint-in-buffer session
       (mapc (lambda (var)
               (insert var) (comint-send-input nil t)
-              (org-babel-comint-wait-for-output session)) var-lines))
+              (org-babel-comint-wait-for-output session))
+	    var-lines))
     session))
 
 (defun org-babel-load-session:shell (session body params)
@@ -277,6 +278,4 @@ return the value of the last statement in BODY."
 
 (provide 'ob-shell)
 
-
-
 ;;; ob-shell.el ends here
diff --git a/lisp/ob-shen.el b/lisp/ob-shen.el
index 1ce711329..0e012ac82 100644
--- a/lisp/ob-shen.el
+++ b/lisp/ob-shen.el
@@ -75,4 +75,5 @@ This function is called by `org-babel-execute-src-block'."
           (error results))))))
 
 (provide 'ob-shen)
+
 ;;; ob-shen.el ends here
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index ced07922f..7c359b988 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -373,6 +373,4 @@ SET COLSEP '|'
 
 (provide 'ob-sql)
 
-
-
 ;;; ob-sql.el ends here
diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el
index 957ee6534..e6d576cc6 100644
--- a/lisp/ob-sqlite.el
+++ b/lisp/ob-sqlite.el
@@ -137,7 +137,8 @@ This function is called by `org-babel-execute-src-block'."
     (mapcar (lambda (row)
 	      (if (eq 'hline row)
 		  'hline
-		(mapcar #'org-babel-string-read row))) result)))
+		(mapcar #'org-babel-string-read row)))
+	    result)))
 
 (defun org-babel-sqlite-offset-colnames (table headers-p)
   "If HEADERS-P is non-nil then offset the first row as column names."
@@ -152,6 +153,4 @@ Prepare SESSION according to the header arguments specified in PARAMS."
 
 (provide 'ob-sqlite)
 
-
-
 ;;; ob-sqlite.el ends here
diff --git a/lisp/ob-stan.el b/lisp/ob-stan.el
index c563a6c3e..7a9fb56da 100644
--- a/lisp/ob-stan.el
+++ b/lisp/ob-stan.el
@@ -82,4 +82,5 @@ Otherwise, write the Stan code directly to the named file."
   (user-error "Stan does not support sessions"))
 
 (provide 'ob-stan)
+
 ;;; ob-stan.el ends here
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index 3132965c7..77daf7be4 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -62,7 +62,8 @@ If STRING ends in a newline character, then remove the newline
 character and replace it with ellipses."
   (if (and (stringp string) (string-match "[\n\r]\\(.\\)?" string))
       (concat (substring string 0 (match-beginning 0))
-	      (when (match-string 1 string) "...")) string))
+	      (when (match-string 1 string) "..."))
+    string))
 
 (defmacro org-sbe (source-block &rest variables)
   "Return the results of calling SOURCE-BLOCK with VARIABLES.
@@ -147,6 +148,4 @@ as shown in the example below.
 
 (provide 'ob-table)
 
-
-
 ;;; ob-table.el ends here
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 1195e89b6..8fd407478 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -544,7 +544,8 @@ which enable the original code blocks to be found."
 			    (save-match-data
 			      (re-search-forward
 			       (concat " " (regexp-quote block-name)
-				       " ends here") nil t)
+				       " ends here")
+			       nil t)
 			      (setq end (line-beginning-position))))))))
 	(unless (and start (< start mid) (< mid end))
 	  (error "Not in tangled code"))
diff --git a/lisp/ol-bbdb.el b/lisp/ol-bbdb.el
index 23db47ae1..8aaf52d7d 100644
--- a/lisp/ol-bbdb.el
+++ b/lisp/ol-bbdb.el
@@ -446,11 +446,11 @@ or far away in the future."
     (cond
      ((= delta 0) " -- today\\&")
      ((= delta 1) " -- tomorrow\\&")
-     ((< delta org-bbdb-general-anniversary-description-after) (format " -- in %d days\\&" delta))
+     ((< delta org-bbdb-general-anniversary-description-after)
+      (format " -- in %d days\\&" delta))
      ((pcase-let ((`(,month ,day ,year) anniv-date))
 	(format " -- %d-%02d-%02d\\&" year month day))))))
 
-
 (defun org-bbdb-anniversaries-future (&optional n)
   "Return list of anniversaries for today and the next n-1 days (default n=7)."
   (let ((n (or n 7)))
diff --git a/lisp/ol-bibtex.el b/lisp/ol-bibtex.el
index ad6622714..5bc02172e 100644
--- a/lisp/ol-bibtex.el
+++ b/lisp/ol-bibtex.el
@@ -556,7 +556,8 @@ With optional argument OPTIONAL, also prompt for optional fields."
     ;; We construct a regexp that searches for "@entrytype{" followed by the key
     (goto-char (point-min))
     (and (re-search-forward (concat "@[a-zA-Z]+[ \t\n]*{[ \t\n]*"
-				    (regexp-quote s) "[ \t\n]*,") nil t)
+				    (regexp-quote s) "[ \t\n]*,")
+			    nil t)
 	 (goto-char (match-beginning 0)))
     (if (and (match-beginning 0) (equal current-prefix-arg '(16)))
 	;; Use double prefix to indicate that any web link should be browsed
@@ -596,7 +597,8 @@ Headlines are exported using `org-bibtex-headline'."
              (with-temp-file filename
                (insert (mapconcat #'identity bibtex-entries "\n")))
              (message "Successfully exported %d BibTeX entries to %s"
-                      (length bibtex-entries) filename) nil))))
+                      (length bibtex-entries) filename)
+	     nil))))
     (when error-point
       (goto-char error-point)
       (message "Bibtex error at %S" (nth 4 (org-heading-components))))))
@@ -661,7 +663,8 @@ This uses `bibtex-parse-entry'."
 	     (when (and (> (length str) 1)
 			(= (aref str 0) (car pair))
 			(= (aref str (1- (length str))) (cdr pair)))
-	       (setf str (substring str 1 (1- (length str)))))) str)))
+	       (setf str (substring str 1 (1- (length str))))))
+	   str)))
     (push (mapcar
            (lambda (pair)
              (cons (let ((field (funcall keyword (car pair))))
diff --git a/lisp/ol-docview.el b/lisp/ol-docview.el
index 22b630299..c2246f956 100644
--- a/lisp/ol-docview.el
+++ b/lisp/ol-docview.el
@@ -98,7 +98,6 @@ and append it."
 	  "::"
 	  (read-from-minibuffer "Page:" "1")))
 
-
 (provide 'ol-docview)
 
 ;;; ol-docview.el ends here
diff --git a/lisp/ol.el b/lisp/ol.el
index 9c9f6554b..2e7b0dd51 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -920,7 +920,8 @@ Abbreviations are defined in `org-link-abbrev-alist'."
 	 ((string-match "%(\\([^)]+\\))" rpl)
 	  (replace-match
 	   (save-match-data
-	     (funcall (intern-soft (match-string 1 rpl)) tag)) t t rpl))
+	     (funcall (intern-soft (match-string 1 rpl)) tag))
+	   t t rpl))
 	 ((string-match "%s" rpl) (replace-match (or tag "") t t rpl))
 	 ((string-match "%h" rpl)
 	  (replace-match (url-hexify-string (or tag "")) t t rpl))
@@ -1902,7 +1903,6 @@ Also refresh fontification if needed."
 
 (org-link-make-regexps)
 
-
 (provide 'ol)
 
 ;;; ol.el ends here
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 0bd3247a8..d9b341cea 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -5301,7 +5301,8 @@ function from a program - use `org-agenda-get-day-entries' instead."
     (when results
       (setq results
 	    (mapcar (lambda (i) (replace-regexp-in-string
-				 org-link-bracket-re "\\2" i)) results))
+				 org-link-bracket-re "\\2" i))
+		    results))
       (concat (org-agenda-finalize-entries results) "\n"))))
 
 ;;; Agenda entry finders
@@ -5520,10 +5521,12 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
 	       (cond
 		((eq org-agenda-todo-ignore-scheduled 'future)
 		 (> (org-time-stamp-to-now
-		     (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+		     (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+		    0))
 		((eq org-agenda-todo-ignore-scheduled 'past)
 		 (<= (org-time-stamp-to-now
-		      (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+		      (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+		     0))
 		((numberp org-agenda-todo-ignore-scheduled)
 		 (org-agenda-todo-custom-ignore-p
 		  (match-string 1) org-agenda-todo-ignore-scheduled))
@@ -5536,10 +5539,12 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
 		 (not (org-deadline-close-p (match-string 1))))
 		((eq org-agenda-todo-ignore-deadlines 'future)
 		 (> (org-time-stamp-to-now
-		     (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+		     (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+		    0))
 		((eq org-agenda-todo-ignore-deadlines 'past)
 		 (<= (org-time-stamp-to-now
-		      (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+		      (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+		     0))
 		((numberp org-agenda-todo-ignore-deadlines)
 		 (org-agenda-todo-custom-ignore-p
 		  (match-string 1) org-agenda-todo-ignore-deadlines))
@@ -5563,10 +5568,12 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
 		     (cond
 		      ((eq org-agenda-todo-ignore-timestamp 'future)
 		       (> (org-time-stamp-to-now
-			   (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+			   (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+			  0))
 		      ((eq org-agenda-todo-ignore-timestamp 'past)
 		       (<= (org-time-stamp-to-now
-			    (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+			    (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+			   0))
 		      ((numberp org-agenda-todo-ignore-timestamp)
 		       (org-agenda-todo-custom-ignore-p
 			(match-string 1) org-agenda-todo-ignore-timestamp))
@@ -7045,7 +7052,8 @@ The optional argument TYPE tells the agenda type."
 		   ;; that isn't there.
 		   pl
 		   (equal (string-match (concat "\\(\\.*\\)" re "\\( +\\)")
-					x pl) pl))
+					x pl)
+			  pl))
 	  (add-text-properties
 	   (or (match-end 1) (match-end 0)) (match-end 0)
 	   (list 'face (org-get-todo-face (match-string 2 x)))
@@ -7122,12 +7130,14 @@ The optional argument TYPE tells the agenda type."
 	 (case-fold-search nil))
     (when pla
       (when (string-match (concat "\\`[ \t]*" (or (get-text-property 0 'org-todo-regexp a) "")
-				  "\\([ \t]*\\[[a-zA-Z0-9]\\]\\)? *") ta)
+				  "\\([ \t]*\\[[a-zA-Z0-9]\\]\\)? *")
+			  ta)
 	(setq ta (substring ta (match-end 0))))
       (setq ta (downcase ta)))
     (when plb
       (when (string-match (concat "\\`[ \t]*" (or (get-text-property 0 'org-todo-regexp b) "")
-				  "\\([ \t]*\\[[a-zA-Z0-9]\\]\\)? *") tb)
+				  "\\([ \t]*\\[[a-zA-Z0-9]\\]\\)? *")
+			  tb)
 	(setq tb (substring tb (match-end 0))))
       (setq tb (downcase tb)))
     (cond ((not (or ta tb)) nil)
@@ -7547,7 +7557,8 @@ When there is already a category filter in place, this command removes the filte
        (cat
         (org-agenda-filter-apply
          (setq org-agenda-category-filter
-	       (list (concat "+" cat))) 'category))
+	       (list (concat "+" cat)))
+	 'category))
        (t (error "No category at point"))))))
 
 (defun org-find-top-headline (&optional pos)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 78ec46392..f4c0586a4 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -722,7 +722,8 @@ If not, show simply the clocked time like 01:50."
   (save-excursion
     (let ((end (save-excursion (org-end-of-subtree))))
       (when (re-search-forward (concat org-clock-string
-				       ".*\\]--\\(\\[[^]]+\\]\\)") end t)
+				       ".*\\]--\\(\\[[^]]+\\]\\)")
+			       end t)
 	(org-time-string-to-time (match-string 1))))))
 
 (defun org-clock-update-mode-line (&optional refresh)
@@ -749,7 +750,8 @@ menu\nmouse-2 will jump to task"))
       (setq org-mode-line-string
 	    (concat (propertize
 		     org-clock-task-overrun-text
-		     'face 'org-mode-line-clock-overrun) org-mode-line-string)))
+		     'face 'org-mode-line-clock-overrun)
+		    org-mode-line-string)))
   (force-mode-line-update))
 
 (defun org-clock-get-clocked-time ()
@@ -894,7 +896,8 @@ If CLOCK-SOUND is non-nil, it overrides `org-clock-sound'."
 	(goto-char (point-min))
 	(while (re-search-forward org-clock-re nil t)
 	  (push (cons (copy-marker (match-end 1) t)
-		      (org-time-string-to-time (match-string 1))) clocks))))
+		      (org-time-string-to-time (match-string 1)))
+		clocks))))
     clocks))
 
 (defsubst org-is-active-clock (clock)
diff --git a/lisp/org-duration.el b/lisp/org-duration.el
index a49e2c919..25ea1800c 100644
--- a/lisp/org-duration.el
+++ b/lisp/org-duration.el
@@ -448,4 +448,5 @@ with \"H:MM:SS\" format, return `h:mm:ss'.  Otherwise, return
 (org-duration-set-regexps)
 
 (provide 'org-duration)
+
 ;;; org-duration.el ends here
diff --git a/lisp/org-keys.el b/lisp/org-keys.el
index 93e1bd7c7..71728741e 100644
--- a/lisp/org-keys.el
+++ b/lisp/org-keys.el
@@ -925,6 +925,6 @@ a-list placed behind the generic `org-babel-key-prefix'.")
   (interactive)
   (describe-bindings org-babel-key-prefix))
 
-
 (provide 'org-keys)
+
 ;;; org-keys.el ends here
diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index 5be1ec728..42f4dac23 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -1257,6 +1257,6 @@ ARG can also be a list of checker names, as symbols, to run."
       (org-lint--display-reports (current-buffer) checkers)
       (message "Org linting process completed"))))
 
-
 (provide 'org-lint)
+
 ;;; org-lint.el ends here
diff --git a/lisp/org-macro.el b/lisp/org-macro.el
index a1b987a8e..eff8adc66 100644
--- a/lisp/org-macro.el
+++ b/lisp/org-macro.el
@@ -417,6 +417,6 @@ Any other non-empty string resets the counter to 1."
                    (t 1))
              org-macro--counter-table)))
 
-
 (provide 'org-macro)
+
 ;;; org-macro.el ends here
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 9bb456ac6..d88776302 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -495,7 +495,8 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
      ["Check Deadlines"
       (if (functionp 'org-check-deadlines-and-todos)
 	  (org-check-deadlines-and-todos org-deadline-warning-days)
-	(org-check-deadlines org-deadline-warning-days)) t]
+	(org-check-deadlines org-deadline-warning-days))
+      t]
      ["Check TODOs" org-show-todo-tree t]
      ("Check Tags"
       ,@(org-mouse-keyword-menu
@@ -741,7 +742,8 @@ This means, between the beginning of line and the point."
 			       (?$ "($) Formula Parameters")
 			       (?# "(#) Recalculation: Auto")
 			       (?* "(*) Recalculation: Manual")
-			       (?' "(') Recalculation: None"))) t))))
+			       (?' "(') Recalculation: None")))
+			   t))))
      ((assq :table contextlist)
       (popup-menu
        '(nil
diff --git a/lisp/org-num.el b/lisp/org-num.el
index a6ddce733..82054606b 100644
--- a/lisp/org-num.el
+++ b/lisp/org-num.el
@@ -466,6 +466,6 @@ NUMBERING is a list of numbers."
     (remove-hook 'after-change-functions #'org-num--verify t)
     (remove-hook 'change-major-mode-hook #'org-num--clear t))))
 
-
 (provide 'org-num)
+
 ;;; org-num.el ends here
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index 8bf883921..a23195d2a 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -144,7 +144,8 @@ and dependent variables."
 	 row-vals)
     (when (>= ind 0) ;; collect values of ind col
       (setf row-vals (mapcar (lambda (row) (setf counter (+ 1 counter))
-			       (cons counter (nth ind row))) table)))
+			       (cons counter (nth ind row)))
+			     table)))
     (when (or deps (>= ind 0)) ;; remove non-plotting columns
       (setf deps (delq ind deps))
       (setf table (mapcar (lambda (row)
diff --git a/lisp/org-refile.el b/lisp/org-refile.el
index 1dc8e8049..70329fe30 100644
--- a/lisp/org-refile.el
+++ b/lisp/org-refile.el
@@ -879,4 +879,5 @@ this function appends the default value from
 	   args)))
 
 (provide 'org-refile)
+
 ;;; org-refile.el ends here
diff --git a/lisp/org-table.el b/lisp/org-table.el
index c422f834a..1d98ce01b 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -2608,7 +2608,8 @@ location of point."
 		  ev (if (numberp ev) (number-to-string ev) ev)
 		  ev (if duration (org-table-time-seconds-to-string
 				   (string-to-number ev)
-				   duration-output-format) ev))
+				   duration-output-format)
+		       ev))
 
 	  ;; Use <...> time-stamps so that Calc can handle them.
 	  (setq form
@@ -4304,7 +4305,8 @@ extension of the given file name, and finally on the variable
 				     (and (string-match-p fileext f) f))
 				   formats)))
 		       org-table-export-default-format)
-		   t t) t t)))
+		   t t)
+		  t t)))
 	  (setq format
 		(org-completing-read
 		 "Format: " formats nil nil deffmt-readable))))
diff --git a/lisp/org.el b/lisp/org.el
index b48185f73..bd3df82dd 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18256,7 +18256,8 @@ and :keyword."
       (when (memq 'org-formula faces)
 	(push (list :table-special
 		    (previous-single-property-change p 'face)
-		    (next-single-property-change p 'face)) clist)))
+		    (next-single-property-change p 'face))
+	      clist)))
      ((org-at-table-p 'any)
       (push (list :table-table) clist)))
     (goto-char p)
@@ -18269,14 +18270,16 @@ and :keyword."
 				  (re-search-backward "[ \t]*\\(#+BEGIN: clocktable\\)" nil t))
 			      (match-beginning 1))
 			 (and (re-search-forward "[ \t]*#\\+END:?" nil t)
-			      (match-end 0))) clist))
+			      (match-end 0)))
+		   clist))
 	    ((org-in-src-block-p)
 	     (push (list :src-block
 			 (and (or (looking-at "[ \t]*\\(#\\+BEGIN_SRC\\)")
 				  (re-search-backward "[ \t]*\\(#+BEGIN_SRC\\)" nil t))
 			      (match-beginning 1))
 			 (and (search-forward "#+END_SRC" nil t)
-			      (match-beginning 0))) clist))))
+			      (match-beginning 0)))
+		   clist))))
     (goto-char p)
 
     ;; Now the small context
@@ -18286,20 +18289,24 @@ and :keyword."
      ((memq 'org-link faces)
       (push (list :link
 		  (previous-single-property-change p 'face)
-		  (next-single-property-change p 'face)) clist))
+		  (next-single-property-change p 'face))
+	    clist))
      ((memq 'org-special-keyword faces)
       (push (list :keyword
 		  (previous-single-property-change p 'face)
-		  (next-single-property-change p 'face)) clist))
+		  (next-single-property-change p 'face))
+	    clist))
      ((setq o (cl-some
 	       (lambda (o)
 		 (and (eq (overlay-get o 'org-overlay-type) 'org-latex-overlay)
 		      o))
 	       (overlays-at (point))))
       (push (list :latex-fragment
-		  (overlay-start o) (overlay-end o)) clist)
+		  (overlay-start o) (overlay-end o))
+	    clist)
       (push (list :latex-preview
-		  (overlay-start o) (overlay-end o)) clist))
+		  (overlay-start o) (overlay-end o))
+	    clist))
      ((org-inside-LaTeX-fragment-p)
       ;; FIXME: positions wrong.
       (push (list :latex-fragment (point) (point)) clist)))
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index 4ffb44a97..8927730cb 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -1273,7 +1273,8 @@ CONTENTS is nil.  INFO is a plist holding contextual information."
   (org-ascii--justify-element
    (org-ascii--box-string
     (org-remove-indentation
-     (org-element-property :value fixed-width)) info)
+     (org-element-property :value fixed-width))
+    info)
    fixed-width info))
 
 
diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el
index d5a9dba5b..0f890534a 100644
--- a/lisp/ox-icalendar.el
+++ b/lisp/ox-icalendar.el
@@ -367,7 +367,8 @@ A headline is blocked when either
 (defun org-icalendar-use-UTC-date-time-p ()
   "Non-nil when `org-icalendar-date-time-format' requires UTC time."
   (char-equal (elt org-icalendar-date-time-format
-		   (1- (length org-icalendar-date-time-format))) ?Z))
+		   (1- (length org-icalendar-date-time-format)))
+	      ?Z))
 
 (defvar org-agenda-default-appointment-duration) ; From org-agenda.el.
 (defun org-icalendar-convert-timestamp (timestamp keyword &optional end tz)
diff --git a/lisp/ox-md.el b/lisp/ox-md.el
index 7515df3a2..e800f98aa 100644
--- a/lisp/ox-md.el
+++ b/lisp/ox-md.el
@@ -455,7 +455,8 @@ INFO is a plist holding contextual information.  See
 			(t (expand-file-name raw-path))))
 	    (caption (org-export-data
 		      (org-export-get-caption
-		       (org-export-get-parent-element link)) info)))
+		       (org-export-get-parent-element link))
+		      info)))
 	(format "![img](%s)"
 		(if (not (org-string-nw-p caption)) path
 		  (format "%s \"%s\"" path caption)))))
diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index 89c6746d8..346518933 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/ox-texinfo.el
@@ -606,7 +606,8 @@ holding export options."
 	 "^@documentencoding \\(AUTO\\)$"
 	 coding
 	 (replace-regexp-in-string
-	  "^@documentlanguage \\(AUTO\\)$" language header t nil 1) t nil 1)))
+	  "^@documentlanguage \\(AUTO\\)$" language header t nil 1)
+	 t nil 1)))
      ;; Additional header options set by #+TEXINFO_HEADER.
      (let ((texinfo-header (plist-get info :texinfo-header)))
        (and texinfo-header (org-element-normalize-string texinfo-header)))
diff --git a/lisp/ox.el b/lisp/ox.el
index b5cf9cc73..feef0b6f8 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -5241,7 +5241,8 @@ rows (resp. columns)."
       (lambda (row)
 	(when (eq (org-element-property :type row) 'standard)
 	  (cl-incf rows)
-	  (unless first-row (setq first-row row)))) info)
+	  (unless first-row (setq first-row row))))
+      info)
     ;; Set number of columns.
     (org-element-map first-row 'table-cell (lambda (_) (cl-incf columns)) info)
     ;; Return value.