Cleanup QueryCompiler interface