Switching back to testing.  I misunderstood the original comments.  It is (I
think) the same basic problem though (the double queries) as the error message
I'm getting is the same.  

I'm going to create a separate issue for this.