Better handling spaces in path names.