Now using local_basename everywhere.