try and simplify some things in the query system#100436

bors merged 4 commits intorust-lang:masterrust-lang/rust:masterfrom

jyn514:macro-query-systemjyn514/rust:macro-query-systemCopy head branch name to clipboard