                                                    (+ indent ind)
                                                    comma?
                                                    pair-seq)]
-                (concat-no-nil l-str-vec
-                               ;(apply concat-no-nil
-                               (interpose-either-nl-hf
-				 ; pred true
-                                 [["," ;(str "," (blanks (inc ind)))
-                                   :none :whitespace 21]
-                                  [(str "\n" (blanks (inc ind))) :none :indent 32]]
-                                 [["," ;(str "," (blanks (inc ind)))
-                                   :none :whitespace 22] ; Fix issue #59 -- don't
-                                  ; put blanks to indent before the next \n
-                                  ["\n" :none :indent 33]
-                                  [(str "\n" (blanks (inc ind))) :none :indent 34]]
-				 ; pred nil
-                                 [[(str "\n" (blanks (inc ind))) :none :indent 35]]
-                                 [[(str "\n" (blanks (inc ind))) :none :indent 36]
-                                  [(str "\n" (blanks (inc ind))) :none :indent 37]]
-                                 (:map options) ;nl-separator?
-				 comma?
-                                 #_(and comma?   ; pred
-				       ; don't put commas after comments
-                                       (not= (nth (first %) 2) :comment)
-                                       (not= (nth (first %) 2) :comment-inline))
-                                 pair-print)
-                               ; )
-                               r-str-vec)))))))))
+                (concat-no-nil
+                  l-str-vec
+                  (interpose-either-nl-hf
+                    ; comma? true
+                    [["," :none :whitespace 21]
+                     [(str "\n" (blanks (inc ind))) :none :indent 32]]
+                    [["," :none :whitespace 22] ; Fix issue #59 -- don't
+                     ; put blanks to indent before the next \n
+                     ["\n" :none :indent 33]
+                     [(str "\n" (blanks (inc ind))) :none :indent 34]]
+                    ; comma? nil
+                    [[(str "\n" (blanks (inc ind))) :none :indent 35]]
+                    [[(str "\n" (blanks (inc ind))) :none :indent 36]
+                     [(str "\n" (blanks (inc ind))) :none :indent 37]]
+                    (:map options) ;nl-separator?
+                    comma?
+                    pair-print)
+                  r-str-vec)))))))))
 
 (defn fzprint-map
   "Format a real map."

                          [[(str "\n") :none :indent 30]
                           [(str "\n" (blanks ind)) :none :indent 31]]
                          suboptions
                          #_(:nl-separator? suboptions)
                          nil
                          coll))

(defn fzprint-map*

                    (conj! out style-vec)
                    (conj-it! out
                              (repeat-element-nl addtl-nl-needed (first sep))
                              style-vec))
                  (if (zero? addtl-nl-needed)
                    (conj-it! out interpose-style-vec style-vec)
                    (conj-it! out
                              (trimr-blanks-style-vec interpose-style-vec)
                              (repeat-element-nl addtl-nl-needed (first sep))
                              style-vec)))
                (and comma?
                     ; We got rid of newlines above
                     (not= what :comment)
                     (not= what :comment-inline)
                     ; Is there a non comment or non newline/indent element
                     ; left in coll, or is this the last one?
                     ; This returns the [hangflow style-vec], but we are not
                     ; using the data, just the existence of the thing here
		     ; Fix for Issue #137.
                     (next-non-comment-nl (next coll)))
                ; should we put an extra new-line before the next element?
                ; Two styles here:
                ;  o  always put one if the previous pair contained a new-line
