Fixed #22649: Beefed up quote_value