Commiting before revamping, following a more idiomatic Clojure approach.