Closing braces of a scope have to be on his own line and aligned correctly

Fixes #10133