Simplify such expressions like "space = currentSpace() and ancestor = currentAncestor()"

Might be difficult to do, but "space = currentSpace() and ancestor = currentAncestor()" should always be equivalent to "ancestor = currentAncestor()". The latter leads to a simpler solr queries, and also the simplified version doesn't need to resolve the confluence space, which is faster and more robust.