I wonder how this has been working so far if macroexpansion is really a problem, as the code is pretty old (almost an year old). Shouldn't someone have noticed mismatching highlighting in case of macroexpansion? After all there's macroexpansion in pretty much any Clojure code that's longer than a few lines.