After the recent refactorings, we can actually completely hide this type. It should help with #63689.