Clear macro idents after expansion
Fix whitespace
parser: Parse macro fields