Remove hole in the middle

There is additional cleanup that will come with the `DirPath` merge but at least the hole-in-the-middle is gone now.
Return types.