I sent the patch to jasta, and fortunately it worked fine for him. He applied it to the devel tree and completely rewrote many of the things that I did poorly. Things are going at a great pace and I've been pleased with the level of cooperation from the maintainer and support from the community for this patch.