Improved macrosyntax, related justments to scanner and other files.