   (cl-loop for column being the elements of schema
            when (symbolp column) collect (emacsql-escape column) into parts
            else collect (emacsql--column-to-string column) into parts
-           finally (return (mapconcat #'identity parts ", "))))
+           finally (cl-return (mapconcat #'identity parts ", "))))
 
 (defun emacsql-create (conn table schema &optional if-not-exists)
   "Create TABLE in CONN with SCHEMA."

        (type nil))
    (while column
      (let ((next (pop column)))
        (case next
          (:primary (push "PRIMARY KEY" output))
          (:non-nil (push "NOT NULL" output))
          (:unique  (push "UNIQUE" output))

               do (forward-char)
               when (or (looking-at "\n") (looking-at "#"))
               collect row into rows and do (setf row ())
               finally (cl-return rows)))))

(defun emacsql-escape (identifier &optional force)
  "Escape an identifier, always with quotes when FORCE is non-nil."
