Cleanup: simplify :clojure/collapse-macro impl