try and simplify some things in the query system
For more information about how rustc works, see the rustc dev guide.
