Ajusting generated code to follow our coding style conventions.