Yeah, mostly I want to isolate the code branch for `root_dir == nil` so we can delete it more easily in the future. Maybe even put a warning in that branch so we can encourage people to give us feedback if they're hitting that case.