Here is an edited patch. I had rebased incorrectly, my apologies.

- John