Merge to XFA: Fix four annoying warnings.