Thanks Jeremy. I've committed these patches... There were some minor reformatting and name tweaks, so you'll get a conflict on your update. Please let me know if they still work for you and if you filed a PR. Warner