Moved call to filepath.Clean() earlier in the CollectPaths function.