Use Str::cisspace in a few more places