Fixed apparent bugs in the macro interpreter.