Work on support for windows pathnames with spaces.