Optimization changes after merge.