Most of what follows is just an indentation change. I did have these changes separate, but rebased them. To get a better diff, you’ll need to indent a working copy and diff it.