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).
