Add new library, backported to a small handful of queries, for resolving types.

Add new library, backported to a small handful of queries, for resolving types. #3648