Go back to setting @path to nil unless the delete option is false; fix Unix handling.
Revert path test.