Use macroexpand-dammit
Merge branch 'master' of github.com:cbaggers/fn_