Reduce some function calls in the query system#108134

Zoxc wants to merge 2 commits intorust-lang:masterrust-lang/rust:masterfrom

Zoxc:query-stackerZoxc/rust:query-stackerCopy head branch name to clipboard