Fix #587: Allow spaces in directory names.