Yet more formatting fixes.