rework string literal processing, for #608