Added macro locals and null parens