Made macro expansion sane, added linenumber to syntax errors