Update for removal of ~"str" literals