Minor improvements to coding style.