Adapted to the PathUtils changes.