Shourya Shukla [off-list ref] writes:

Take advantage of helper function 'test_path_is_file()' to
replace 'test -f' since the function makes the code more
readable and gives better error messages.

Looks good.  Thanks.