One last minor tweak to clean_fname().