More formatting fixes.