Remove need for weird _XKEYCHECK macro + minor edits