heh. I *just* sent essentially the same upgrade your way at http://codereview.appspot.com/1460041/show
I notice however that the introduction of UriManager at r951107 breaks cajoled gadgets but this is not caught by any of the existing tests. http://codereview.appspot.com/1714043/show
