Here is another patch, with a few minor changes. It depends on the
previously posted patches, so those should be applied first.