Don't we need to keep the `null === $this->cwd` condition?