Make :NO more split-safe