Fix peephole optimizer