Eliminate use of .basename to gain back some speed