Maximize use of path.basename