issue #19827: More fixes on quote. Still not done, though.