The changes support the fact the CF does not have a CurrentDirectory,

CF does not have a CurrentDirectory, and consequently, will not allow
relative paths or file names in any file or directory method.  These
fixes solve that problem.
In any case, please don't do unrelated reformatting when you make a change. It makes the PR hard to review.