Handle spaces in dirnames, part 2.