Jeff, I would certainly not mind giving a hand with testing. Feel free to mail it to me, though I will go to bed in a few hours. I'm currently running 4.6.1-beta1. Let me know if I should use something different.
I went ahead and committed the patch to 4.6 and the head.
I did not update the 4.6.1-beta1 tag so you would need to
update to the oacs-4-6 tag in the tcl directory.
It's no longer necessary to fully qualify the
query names (it seems to all work correctly with simple
names and the correct full name is constructed).