See the attached patch file diff'd against maint. I've also attached a separate file that has your comments and my responses. Hope they are self-explanatory.

--Lambda Coder.