Even more formatting fixes.