Changed clean_fname() calls to the updated arg syntax.