More improvements/bug fixes in SyntaxFormatter