Fixes to autofmt, make it more aggressive

[jkelleyrtp]

• [x] Fix: #2203
• [x] Fix: #2204
• [x] Fix: #2232

Also just makes our line splitting more aggressive since folks in the discord are not fans of how we merge lines together.