Fixed to aggressive x-folding in opt_const