Fix assumption rewriter