Standardize on pathname/dirname