(cherry picked from commit df3c5ab402)
df3c5ab402
(cherry picked from commit f924f06df7)
f924f06df7
(Can't cherry-pick because GitHub tricked me into rebasing instead of squashing.)
I really kinda hate how insistent clang-format is to have line breaks *IFF THE LINE IS TOO LONG*. Like... lemme just add a break if it looks better, will you? But it is the style at this time, so we shall tie an onion to our belt.