4142792d1f
Also get rid of the indirection through query_definitions for the type-related queries.
Also get rid of the indirection through query_definitions for the type-related queries.