regarding .endmacro as when the macro is parsed regularily: A .endmacro ends the macro only if is the first token on a line.
was expected and what was found instead. Also improved error recovery in a few places.