Pass types through `resolve_type` in a few additional places