Match closing braces/brackets better, when the opening brace starts the line
Fix several indentation bugs
The previous fix is no longer needed