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