Query..remove(): Recover optimized expressions that may have become least restrictive after removal from current query that were more restrictive