Fixes #2938. All of these suggested future changes are out of scope for an autoformatter and should be handled by a linter instead.