Switch to clojure core.match