Adding more calls to safe_fname().