Minor revisions to coding style.