Backport quote-related commits from Emacs