Minor coding style changes.