Fixed macro expander to use regular evaluator