remove evaluator-specific code from macros.c