Backport latest quasiquotes from master