Fix some edge cases of the formatter.