More coding style cleanup.