Further refactoring to eliminate all but one place where PathType (to deprecate/promote) is used.