More ~str pattern removal