Resolve instances of `TypePath` more accurately #8117

Job	Run time
build-and-check-asan	31m 4s
build-and-check-clang-macos	52m 29s
build-and-check-gcc-48	29m 52s
build-and-check-ubuntu-32bit	24m 51s
build-and-check-ubuntu-64bit	25m 21s
build-and-check-ubuntu-64bit-glibcxx	27m 22s
	3h 10m 59s

Provide feedback