Agreed to get rid of the extensionless mapping, removing `isDir` in the process