Fix return value of make_filename() when no filename_format