More pulling up references to filesystem.withBaseDir(null) towards plugable fs.