Improve error recovery for macros.