Avoid transforming TK_COLLATE or TK_UNLIKELY Expr nodes to TK_REFERENCE.

Instead, transform the uppermost Expr node in the expression tree that
is not of this type. Fix for [e1e07ef2].

FossilOrigin-Name: 54110870487f78013ab1b554413c18baa2bdc07d979bc65c110f32d30c3b53fe

diff --cc manifest
index 522fd6ca919063548c3a595df4c8efc6a9611c37,1b9d4e7d3ed579b4d0cf8b6f5fb705b2a03b466b..fb6f4fccbdf427ac872f30482fbde17efe88f716
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sminor\sproblems\sin\sthe\stest\scode\sin\stest_demovfs.c.
- D 2019-06-15T15:32:37.620
 -C Avoid\stransforming\sTK_COLLATE\sor\sTK_UNLIKELY\sExpr\snodes\sto\sTK_REFERENCE.\sInstead,\stransform\sthe\suppermost\sExpr\snode\sin\sthe\sexpression\stree\sthat\sis\snot\sof\sthis\stype.
 -D 2019-06-16T08:58:14.849
++C Avoid\stransforming\sTK_COLLATE\sor\sTK_UNLIKELY\sExpr\snodes\sto\sTK_REFERENCE.\nInstead,\stransform\sthe\suppermost\sExpr\snode\sin\sthe\sexpression\stree\sthat\nis\snot\sof\sthis\stype.\sFix\sfor\s[e1e07ef2].
++D 2019-06-16T14:56:41.259
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1830,7 -1830,10 +1830,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 0bbceebb126c94b5159079a341fa16e8424b7f2f6b9364561516964e871fb6e0
- R ad3804e28123fb8cc31cc68386329653
- U dan
- Z ba4d1a6df34a3362ceba4b029fa2fe75
 -P ca4ddfefc1be1afbf366d87c47f0dd1122350d7ab34ba60020c5babb64a654a4
++P ca4ddfefc1be1afbf366d87c47f0dd1122350d7ab34ba60020c5babb64a654a4 ba7870e292919cf6c2f4b65b63fb0420ba2718eb0a797e0ba5302eec551a4238
+ R 18312679532d55fb24bce06818aa1e91
 -T *branch * tkt-e1e07ef2
 -T *sym-tkt-e1e07ef2 *
 -T -sym-trunk *
 -U dan
 -Z 0c99556d547b90fce21532cb343b5082
++T +closed ba7870e292919cf6c2f4b65b63fb0420ba2718eb0a797e0ba5302eec551a4238
++U drh
++Z f0236900c5824284c0e117fa258f5cb9

diff --cc manifest.uuid
index 2b4cb0fec734e1f3fe98511464c4f77bdd0e7a1e,0fb49d78afe82c5a9c3c9c1c0c71f07366e0c59a..0ad1747272d395620006d5068c45b933349a294b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ca4ddfefc1be1afbf366d87c47f0dd1122350d7ab34ba60020c5babb64a654a4
 -ba7870e292919cf6c2f4b65b63fb0420ba2718eb0a797e0ba5302eec551a4238
++54110870487f78013ab1b554413c18baa2bdc07d979bc65c110f32d30c3b53fe