Refine a bit more the quote suppression logic
Add missing stub