Here is another patch set with the suggested changes incorporated.