More small code formatting changes.