Constant Folding Optimization enhanced