Some more work for the quote special form