Fix unquote compatibility