Some more formatting fixes.