Improve clojure support.