Changes to ensure that dryRun can properly mock up all interim and target dirs/files.