This is an adaptation of 86ae6dcf to the 4.1 branch. The point is to
avoid accidential ++ and -- in generated code.