Fix more breakage caused by ~str removal