More on coding style. #270