Factor `change_query_types`, `_change_query_types`

* Add `children` of non-partial types to result of `_change_query_types`