Remove need for weird _XKEYCHECK/_ALLOW_KEYWORD_MACROS macro hack + minor edits