Last piece of refactoring to remove need for `PathType` from ClusterMate