Merge to XFA: Kill FX_DEFINEHANDLE