I hadn't realized that the shfmt version I was using previously was a
couple of years old, and a lot of improvements/changes have been made
since then. That said, these changes are pretty minor.