Merge to XFA: Tidy up JS_Defines.h