Yet more formatting changes.