A few minor fixes

Nothing really important, just some stuff I came across while I was doing the header-map work.

I'm not positive that my whitespace changes are all right, it could be that I'm not using the most up-to-date clojure+emacs setup, it seems like the indentation for (are ...) changed...