More fixes to auto formatter.