Merge formatting fixes.