add macroexpand
add back :eval, this will *only* be used for the top-level form being analyzed
commit comments so I don't forget