Minor tweaks to the code style.