Having a separate query compiler makes me kind of happy. I've been thinking for a while that the Query class was getting a bit unwieldy.