Slowly getting rid of ad hoc functions and relying on clojure.core again
Whitespace is going away.