minor fixes to make it work from a fresh package-install

(though I suppose the melpa recipe also needs to mention dash?)
Hmm, I think an alternative is to simply move the macros to the top of the file.