Use Str::cisspace in a few more places
Fix tab complete not adding a space.

Thanks Amanieu.