Query: keep track of optimized-out expressions to allow removal without exception