Cosmetic code generator changes