More minor code formatting changes.