Revert "Revert "Avoid macroexpanding both on analyze and eval -- the macro may have side-effects""

The issues that prevented this from working have now been fixed in the tools.analyzer side