Updated for Clojure 1.5+