Add _ALLOW_KEYWORD_MACROS definition
clean up changes for pull request
clean up changes for pull request