Pull to conform to the new structure of the query processor.