It turned out to be not-completely-trivial to rebase onto master, so I decided to post the rebased patches for potential review. I also did a bunch of cosmetic changes, but other than not breaking body: searching, there are no functionality changes since [1] [1] id:20190327111627.15903-1-david at tethera.net