- Added more calls to safe_fname().