Fix last changes to support whitespace in directory names.