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.
IMO, it creates too much white space to indent here. Of course, I'm a guy who uses the "digital" method of aligning text - i.e. the digits on my hands. Anyway, let's keep the PR clean and we can debate alternatives on the developer or committer list.