Fixed some issues with macro evaluation.