Improved generated code cosmetic aspect.