Better handling of escaped vs unescaped strings from literals