Query: optimize ..remove() to avoid reconstructing the entire query to process remaining optimized-out expressions; improve documentation