Simplify file_prefix handling, and use of *dir variable.
1 file changed