Fixed some macro namespace issues.