Impove the handling of backquote and comma.