Philip Kaludercic <philipk@posteo.net> writes:

> It seems it isn't that difficult to do this (though the patch is longer
> than it ought to be because of indentation changes)

It turned out to be a bit more difficult than I had assumed at first,
but this patch should address the remaining issues I had: