Make coding style more consistent.