[#4510] CS fixes

- Move closing paren/opening brace to next line
  - constructor (multi-line definition)
  - if statement (multi-line conditional)