Additional formatting fixes.