Use the new safe_fname() function.