Don't add extra comma after comment
Improves indenter - handle better complex strings