more removal of ~str literals