Fixed macro expansion namespace issue.