> Thanks again for working on this.

Thanks for your comments! I've attached an updated patch.